"#13250: Scripting and templating using freemarker" cvs server: warning: file `openide/dialogs/apichanges.xml' seems to still contain conflict indicators Checking in libs/external/freemarker-2.3.8-license.txt; /shared/data/ccvs/repository/libs/external/freemarker-2.3.8-license.txt,v <-- freemarker-2.3.8-license.txt new revision: 1.2; previous revision: 1.1 done RCS /shared/data/ccvs/repository/libs/external/freemarker-2.3.8.jar,v done Checking in libs/external/freemarker-2.3.8.jar; /shared/data/ccvs/repository/libs/external/freemarker-2.3.8.jar,v <-- freemarker-2.3.8.jar initial revision: 1.1 done Checking in libs/external/jsr223-api-license.txt; /shared/data/ccvs/repository/libs/external/jsr223-api-license.txt,v <-- jsr223-api-license.txt new revision: 1.2; previous revision: 1.1 done RCS /shared/data/ccvs/repository/libs/external/jsr223-api.jar,v done Checking in libs/external/jsr223-api.jar; /shared/data/ccvs/repository/libs/external/jsr223-api.jar,v <-- jsr223-api.jar initial revision: 1.1 done Checking in libs/freemarker/.cvsignore; /shared/data/ccvs/repository/libs/freemarker/.cvsignore,v <-- .cvsignore new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/build.xml; /shared/data/ccvs/repository/libs/freemarker/build.xml,v <-- build.xml new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/manifest.mf; /shared/data/ccvs/repository/libs/freemarker/manifest.mf,v <-- manifest.mf new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/nbproject/.cvsignore; /shared/data/ccvs/repository/libs/freemarker/nbproject/.cvsignore,v <-- .cvsignore new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/nbproject/project.properties; /shared/data/ccvs/repository/libs/freemarker/nbproject/project.properties,v <-- project.properties new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/nbproject/project.xml; /shared/data/ccvs/repository/libs/freemarker/nbproject/project.xml,v <-- project.xml new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/src/META-INF/services/javax.script.ScriptEngineFactory; /shared/data/ccvs/repository/libs/freemarker/src/META-INF/services/javax.script.ScriptEngineFactory,v <-- javax.script.ScriptEngineFactory new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/src/org/netbeans/libs/freemarker/Bundle.properties; /shared/data/ccvs/repository/libs/freemarker/src/org/netbeans/libs/freemarker/Bundle.properties,v <-- Bundle.properties new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java; /shared/data/ccvs/repository/libs/freemarker/src/org/netbeans/libs/freemarker/FreemarkerEngine.java,v <-- FreemarkerEngine.java new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java; /shared/data/ccvs/repository/libs/freemarker/src/org/netbeans/libs/freemarker/FreemarkerFactory.java,v <-- FreemarkerFactory.java new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java; /shared/data/ccvs/repository/libs/freemarker/src/org/netbeans/libs/freemarker/RsrcLoader.java,v <-- RsrcLoader.java new revision: 1.2; previous revision: 1.1 done Checking in libs/freemarker/test/unit/src/org/netbeans/api/templates/ProcessorTest.java; /shared/data/ccvs/repository/libs/freemarker/test/unit/src/org/netbeans/api/templates/ProcessorTest.java,v <-- ProcessorTest.java new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/.cvsignore; /shared/data/ccvs/repository/libs/jsr223/.cvsignore,v <-- .cvsignore new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/arch.xml; /shared/data/ccvs/repository/libs/jsr223/arch.xml,v <-- arch.xml new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/build.xml; /shared/data/ccvs/repository/libs/jsr223/build.xml,v <-- build.xml new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/manifest.mf; /shared/data/ccvs/repository/libs/jsr223/manifest.mf,v <-- manifest.mf new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/nbproject/.cvsignore; /shared/data/ccvs/repository/libs/jsr223/nbproject/.cvsignore,v <-- .cvsignore new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/nbproject/project.properties; /shared/data/ccvs/repository/libs/jsr223/nbproject/project.properties,v <-- project.properties new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/nbproject/project.xml; /shared/data/ccvs/repository/libs/jsr223/nbproject/project.xml,v <-- project.xml new revision: 1.2; previous revision: 1.1 done Checking in libs/jsr223/src/org/netbeans/libs/jsr223/Bundle.properties; /shared/data/ccvs/repository/libs/jsr223/src/org/netbeans/libs/jsr223/Bundle.properties,v <-- Bundle.properties new revision: 1.2; previous revision: 1.1 done Checking in openide/arch/arch-openide-datasystems.xml; /shared/data/ccvs/repository/openide/arch/arch-openide-datasystems.xml,v <-- arch-openide-datasystems.xml new revision: 1.33; previous revision: 1.32 done Checking in openide/dialogs/apichanges.xml; /shared/data/ccvs/repository/openide/dialogs/apichanges.xml,v <-- apichanges.xml new revision: 1.12; previous revision: 1.11 done Checking in openide/dialogs/src/org/openide/WizardDescriptor.java; /shared/data/ccvs/repository/openide/dialogs/src/org/openide/WizardDescriptor.java,v <-- WizardDescriptor.java new revision: 1.42; previous revision: 1.41 done Checking in openide/dialogs/test/unit/src/org/openide/PropertiesTest.java; /shared/data/ccvs/repository/openide/dialogs/test/unit/src/org/openide/PropertiesTest.java,v <-- PropertiesTest.java new revision: 1.2; previous revision: 1.1 done Checking in openide/loaders/manifest.mf; /shared/data/ccvs/repository/openide/loaders/manifest.mf,v <-- manifest.mf new revision: 1.30; previous revision: 1.29 done Checking in openide/loaders/api/apichanges.xml; /shared/data/ccvs/repository/openide/loaders/api/apichanges.xml,v <-- apichanges.xml new revision: 1.25; previous revision: 1.24 done Checking in openide/loaders/nbproject/project.xml; /shared/data/ccvs/repository/openide/loaders/nbproject/project.xml,v <-- project.xml new revision: 1.25; previous revision: 1.24 done Checking in openide/loaders/src/org/openide/loaders/CreateFromTemplateAttributesProvider.java; /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/CreateFromTemplateAttributesProvider.java,v <-- CreateFromTemplateAttributesProvider.java new revision: 1.2; previous revision: 1.1 done Checking in openide/loaders/src/org/openide/loaders/CreateFromTemplateHandler.java; /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/CreateFromTemplateHandler.java,v <-- CreateFromTemplateHandler.java new revision: 1.2; previous revision: 1.1 done Checking in openide/loaders/src/org/openide/loaders/DataObject.java; /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/DataObject.java,v <-- DataObject.java new revision: 1.34; previous revision: 1.33 done Checking in openide/loaders/src/org/openide/loaders/FileEntry.java; /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/FileEntry.java,v <-- FileEntry.java new revision: 1.4; previous revision: 1.3 done Checking in openide/loaders/src/org/openide/loaders/MultiDataObject.java; /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/MultiDataObject.java,v <-- MultiDataObject.java new revision: 1.26; previous revision: 1.25 done Checking in openide/loaders/src/org/openide/loaders/TemplateWizard.java; /shared/data/ccvs/repository/openide/loaders/src/org/openide/loaders/TemplateWizard.java,v <-- TemplateWizard.java new revision: 1.27; previous revision: 1.26 done Checking in openide/loaders/test/unit/src/org/openide/loaders/CreateFromTemplateHandlerTest.java; /shared/data/ccvs/repository/openide/loaders/test/unit/src/org/openide/loaders/CreateFromTemplateHandlerTest.java,v <-- CreateFromTemplateHandlerTest.java new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/.cvsignore; /shared/data/ccvs/repository/openide/templates/.cvsignore,v <-- .cvsignore new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/build.xml; /shared/data/ccvs/repository/openide/templates/build.xml,v <-- build.xml new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/manifest.mf; /shared/data/ccvs/repository/openide/templates/manifest.mf,v <-- manifest.mf new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/nbproject/.cvsignore; /shared/data/ccvs/repository/openide/templates/nbproject/.cvsignore,v <-- .cvsignore new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/nbproject/project.properties; /shared/data/ccvs/repository/openide/templates/nbproject/project.properties,v <-- project.properties new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/nbproject/project.xml; /shared/data/ccvs/repository/openide/templates/nbproject/project.xml,v <-- project.xml new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/src/META-INF/services/org.openide.loaders.CreateFromTemplateHandler; /shared/data/ccvs/repository/openide/templates/src/META-INF/services/org.openide.loaders.CreateFromTemplateHandler,v <-- org.openide.loaders.CreateFromTemplateHandler new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/src/org/netbeans/modules/templates/Bundle.properties; /shared/data/ccvs/repository/openide/templates/src/org/netbeans/modules/templates/Bundle.properties,v <-- Bundle.properties new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/src/org/netbeans/modules/templates/ScriptingCreateFromTemplateHandler.java; /shared/data/ccvs/repository/openide/templates/src/org/netbeans/modules/templates/ScriptingCreateFromTemplateHandler.java,v <-- ScriptingCreateFromTemplateHandler.java new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/src/org/netbeans/modules/templates/layer.xml; /shared/data/ccvs/repository/openide/templates/src/org/netbeans/modules/templates/layer.xml,v <-- layer.xml new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/test/unit/src/org/netbeans/modules/templates/IndentEngineIntTest.java; /shared/data/ccvs/repository/openide/templates/test/unit/src/org/netbeans/modules/templates/IndentEngineIntTest.java,v <-- IndentEngineIntTest.java new revision: 1.2; previous revision: 1.1 done Checking in openide/templates/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java; /shared/data/ccvs/repository/openide/templates/test/unit/src/org/netbeans/modules/templates/SCFTHandlerTest.java,v <-- SCFTHandlerTest.java new revision: 1.2; previous revision: 1.1 done Checking in openide/www/tutorial/api-design.html; /shared/data/ccvs/repository/openide/www/tutorial/api-design.html,v <-- api-design.html new revision: 1.51; previous revision: 1.50 done Checking in openide/www/tutorial/reviews/index.html; /shared/data/ccvs/repository/openide/www/tutorial/reviews/index.html,v <-- index.html new revision: 1.79; previous revision: 1.78 done Checking in openide/www/tutorial/reviews/opinions_13250.html; /shared/data/ccvs/repository/openide/www/tutorial/reviews/opinions_13250.html,v <-- opinions_13250.html new revision: 1.15; previous revision: 1.14 done Checking in openide/www/tutorial/reviews/opinions_88471.html; /shared/data/ccvs/repository/openide/www/tutorial/reviews/opinions_88471.html,v <-- opinions_88471.html new revision: 1.6; previous revision: 1.5 done Checking in ide/golden/cluster-deps.txt; /shared/data/ccvs/repository/ide/golden/cluster-deps.txt,v <-- cluster-deps.txt new revision: 1.76; previous revision: 1.75 done Checking in ide/golden/deps.txt; /shared/data/ccvs/repository/ide/golden/deps.txt,v <-- deps.txt new revision: 1.443; previous revision: 1.442 done Checking in ide/golden/files-layout.txt; /shared/data/ccvs/repository/ide/golden/files-layout.txt,v <-- files-layout.txt new revision: 1.204; previous revision: 1.203 done Checking in ide/golden/modules.txt; /shared/data/ccvs/repository/ide/golden/modules.txt,v <-- modules.txt new revision: 1.109; previous revision: 1.108 done Checking in ide/golden/public-packages.txt; /shared/data/ccvs/repository/ide/golden/public-packages.txt,v <-- public-packages.txt new revision: 1.85; previous revision: 1.84