| Displaying differences for changeset |
| @@ -11,6 +11,7 @@ |
| <description>Builds, tests, and runs the project csip-eft.</description> |
| <import file="../csip-core/jenkins-build.xml"/> |
| <import file="nbproject/build-impl.xml"/> |
| + |
| <!-- |
| There exist several targets which are by default empty and which can be |
| @@ -50,6 +50,36 @@ |
| </target> |
| <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/> |
| <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init"> |
| + <webproject1:property name="platform.home" value="platforms.${platform.active}.home"/> |
| + <webproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/> |
| + <webproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/> |
| + <webproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/> |
| + <condition property="platform.javac" value="${platform.home}/bin/javac"> |
| + <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/> |
| + </condition> |
| + <property name="platform.javac" value="${platform.javac.tmp}"/> |
| + <webproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/> |
| + <condition property="platform.java" value="${platform.home}/bin/java"> |
| + <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/> |
| + </condition> |
| + <property name="platform.java" value="${platform.java.tmp}"/> |
| + <webproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/> |
| + <condition property="platform.javadoc" value="${platform.home}/bin/javadoc"> |
| + <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/> |
| + </condition> |
| + <property name="platform.javadoc" value="${platform.javadoc.tmp}"/> |
| + <fail unless="platform.home">Must set platform.home</fail> |
| + <fail unless="platform.bootcp">Must set platform.bootcp</fail> |
| + <fail unless="platform.java">Must set platform.java</fail> |
| + <fail unless="platform.javac">Must set platform.javac</fail> |
| + <fail if="platform.invalid"> |
| + The J2SE Platform is not correctly set up. |
| + Your active platform is: ${platform.active}, but the corresponding property "platforms.${platform.active}.home" is not found in the project's properties files. |
| + Either open the project in the IDE and setup the Platform with the same name or add it manually. |
| + For example like this: |
| + ant -Duser.properties.file=<path_to_property_file> jar (where you put the property "platforms.${platform.active}.home" in a .properties file) |
| + or ant -Dplatforms.${platform.active}.home=<path_to_JDK_home> jar (where no properties file is used) |
| + </fail> |
| <condition property="have.tests"> |
| <or> |
| <available file="${test.src.dir}"/> |
| @@ -191,15 +221,6 @@ |
| <length length="0" string="${endorsed.classpath}" when="greater"/> |
| </and> |
| </condition> |
| - <condition else="false" property="jdkBug6558476"> |
| - <and> |
| - <matches pattern="1\.[56]" string="${java.specification.version}"/> |
| - <not> |
| - <os family="unix"/> |
| - </not> |
| - </and> |
| - </condition> |
| - <property name="javac.fork" value="${jdkBug6558476}"/> |
| <condition property="junit.available"> |
| <or> |
| <available classname="org.junit.Test" classpath="${run.test.classpath}"/> |
| @@ -294,7 +315,7 @@ |
| <property location="${build.dir}/empty" name="empty.dir"/> |
| <mkdir dir="${empty.dir}"/> |
| <mkdir dir="@{apgeneratedsrcdir}"/> |
| - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
| + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
| <src> |
| <dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
| <include name="*"/> |
| @@ -331,7 +352,7 @@ |
| <sequential> |
| <property location="${build.dir}/empty" name="empty.dir"/> |
| <mkdir dir="${empty.dir}"/> |
| - <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}"> |
| + <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" executable="${platform.javac}" fork="yes" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}"> |
| <src> |
| <dirset dir="@{gensrcdir}" erroronmissingdir="false"> |
| <include name="*"/> |
| @@ -408,7 +429,7 @@ |
| <attribute default="" name="testmethods"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
| <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
| <syspropertyset> |
| <propertyref prefix="test-sys-prop."/> |
| @@ -431,7 +452,7 @@ |
| <element name="customize" optional="true"/> |
| <sequential> |
| <property name="run.jvmargs.ide" value=""/> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
| <batchtest todir="${build.test.results.dir}"> |
| <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
| <filename name="@{testincludes}"/> |
| @@ -471,7 +492,7 @@ |
| </fileset> |
| </union> |
| <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/> |
| - <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-example" testname="TestNG tests" workingDir="${basedir}"> |
| + <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="csip-example" testname="TestNG tests" workingDir="${basedir}"> |
| <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/> |
| <propertyset> |
| <propertyref prefix="test-sys-prop."/> |
| @@ -549,7 +570,7 @@ |
| <attribute default="" name="testmethods"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${java.io.tmpdir}"> |
| <test methods="@{testmethods}" name="@{testincludes}" todir="${build.test.results.dir}"/> |
| <syspropertyset> |
| <propertyref prefix="test-sys-prop."/> |
| @@ -558,8 +579,7 @@ |
| <formatter type="brief" usefile="false"/> |
| <formatter type="xml"/> |
| <jvmarg value="-ea"/> |
| - <jvmarg line="${debug-args-line}"/> |
| - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| <customize/> |
| </junit> |
| </sequential> |
| @@ -574,7 +594,7 @@ |
| <element name="customize" optional="true"/> |
| <sequential> |
| <property name="run.jvmargs.ide" value=""/> |
| - <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${build.dir}"> |
| + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true" tempdir="${build.dir}"> |
| <batchtest todir="${build.test.results.dir}"> |
| <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> |
| <filename name="@{testincludes}"/> |
| @@ -591,8 +611,7 @@ |
| <formatter type="xml"/> |
| <jvmarg value="-ea"/> |
| <jvmarg line="${run.jvmargs.ide}"/> |
| - <jvmarg line="${debug-args-line}"/> |
| - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| <customize/> |
| </junit> |
| </sequential> |
| @@ -698,7 +717,7 @@ |
| <attribute default="${debug.classpath}" name="classpath"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <java classname="@{classname}" fork="true"> |
| + <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
| <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
| <jvmarg line="${runmain.jvmargs}"/> |
| <classpath> |
| @@ -730,6 +749,9 @@ |
| <classpath> |
| <path path="@{classpath}"/> |
| </classpath> |
| + <bootclasspath> |
| + <path path="${platform.bootcp}"/> |
| + </bootclasspath> |
| </nbjpdastart> |
| </sequential> |
| </macrodef> |
| @@ -750,18 +772,6 @@ |
| </macrodef> |
| </target> |
| <target name="-init-debug-args"> |
| - <property name="version-output" value="java version "${ant.java.version}"/> |
| - <condition property="have-jdk-older-than-1.4"> |
| - <or> |
| - <contains string="${version-output}" substring="java version "1.0"/> |
| - <contains string="${version-output}" substring="java version "1.1"/> |
| - <contains string="${version-output}" substring="java version "1.2"/> |
| - <contains string="${version-output}" substring="java version "1.3"/> |
| - </or> |
| - </condition> |
| - <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none"> |
| - <istrue value="${have-jdk-older-than-1.4}"/> |
| - </condition> |
| <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem"> |
| <os family="windows"/> |
| </condition> |
| @@ -776,10 +786,9 @@ |
| <attribute default="${application.args.param}" name="args"/> |
| <element name="customize" optional="true"/> |
| <sequential> |
| - <java classname="@{classname}" fork="true"> |
| + <java classname="@{classname}" fork="true" jvm="${platform.java}"> |
| <jvmarg line="${endorsed.classpath.cmd.line.arg}"/> |
| - <jvmarg line="${debug-args-line}"/> |
| - <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> |
| + <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/> |
| <jvmarg line="${runmain.jvmargs}"/> |
| <classpath> |
| <path path="@{classpath}"/> |
| @@ -1183,6 +1192,9 @@ |
| <sourcepath> |
| <path path="${web.docbase.dir}"/> |
| </sourcepath> |
| + <bootclasspath> |
| + <path path="${platform.bootcp}"/> |
| + </bootclasspath> |
| </nbjpdaconnect> |
| </target> |
| <target if="do.display.browser.debug.old" name="debug-display-browser-old"> |
| @@ -1305,7 +1317,7 @@ |
| --> |
| <target depends="init" if="have.sources" name="javadoc-build"> |
| <mkdir dir="${dist.javadoc.dir}"/> |
| - <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
| + <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}"> |
| <classpath> |
| <path path="${javac.classpath}:${j2ee.platform.classpath}"/> |
| </classpath> |
| @@ -1422,6 +1434,7 @@ |
| </target> |
| <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> |
| <target depends="init,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test-method" name="debug-test-method"/> |
| + <target depends="debug-test-method" name="debug-single-method"/> |
| <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> |
| <webproject1:nbjpdareload dir="${build.test.classes.dir}"/> |
| </target> |
| @@ -3,9 +3,9 @@ |
| build.xml.stylesheet.CRC32=651128d4@1.65.1.1 |
| # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. |
| # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. |
| -nbproject/build-impl.xml.data.CRC32=ff3b7911 |
| -nbproject/build-impl.xml.script.CRC32=59440e26 |
| -nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1 |
| +nbproject/build-impl.xml.data.CRC32=16fcfe9f |
| +nbproject/build-impl.xml.script.CRC32=5d2b7162 |
| +nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.90.0.1 |
| nbproject/rest-build.xml.data.CRC32=bff4a8fe |
| nbproject/rest-build.xml.script.CRC32=4734534b |
| nbproject/rest-build.xml.stylesheet.CRC32=5f13befe@1.21 |
| @@ -1,7 +1,7 @@ |
| -deploy.ant.properties.file=/home/od/.netbeans/8.2/tomcat80.properties |
| -j2ee.server.home=/opt/apache-tomcat-8.0.20 |
| -j2ee.server.instance=tomcat80:home=/opt/apache-tomcat-8.0.20 |
| +deploy.ant.properties.file=/home/od/.netbeans/14/tomcat80.properties |
| +j2ee.server.home=/opt/apache-tomcat-8.5.57 |
| +j2ee.server.instance=tomcat80:home=/opt/apache-tomcat-8.5.57 |
| javac.debug=true |
| javadoc.preview=true |
| selected.browser=default |
| -user.properties.file=/home/od/.netbeans/8.2/build.properties |
| +user.properties.file=/home/od/.netbeans/14/build.properties |
| @@ -42,13 +42,30 @@ |
| <file>file:/od/projects/csip-all/csip-example/web/WEB-INF/csip-defaults.json</file> |
| <file>file:/od/projects/csip-all/csip-example/build.xml</file> |
| </group> |
| - <group name="RTI"> |
| + <group name="csip-core"> |
| <file>file:/od/projects/csip-all/csip-example/build.xml</file> |
| <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V2_0.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/web/META-INF/context.xml</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/ApplicationConfig.java</file> |
| </group> |
| - <group name="csip-core"> |
| + <group name="RTI"/> |
| + <group name="TT"> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/externalexe/V2_0.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/web/WEB-INF/csip-defaults.json</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/externalexe/V1_0.java</file> |
| + </group> |
| + <group name="Refac"/> |
| + <group name="NWCC"> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V2_0.json</file> |
| <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V2_0.java</file> |
| - <file>file:/od/projects/csip-all/csip-example/src/java/m/example/ApplicationConfig.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/simpleservice/V3.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/web/META-INF/context.xml</file> |
| + <file>file:/od/projects/csip-all/csip-example/web/WEB-INF/csip-defaults.json</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/stats/V2_0.java</file> |
| + </group> |
| + <group name="work"> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/solitaire/SolitaireBitSet.java</file> |
| + <file>file:/od/projects/csip-all/csip-example/src/java/m/example/solitaire/Solitaire.java</file> |
| </group> |
| </open-files> |
| </project-private> |
| @@ -1,6 +1,6 @@ |
| file.reference.commons-math3-3.6.1.jar=lib/commons-math3-3.6.1.jar |
| file.reference.guava-23.5-jre.jar=lib/guava-23.5-jre.jar |
| -j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.4.1.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-spdy.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
| +j2ee.platform.classpath=${j2ee.server.home}/lib/annotations-api.jar:${j2ee.server.home}/lib/catalina-ant.jar:${j2ee.server.home}/lib/catalina-ha.jar:${j2ee.server.home}/lib/catalina-storeconfig.jar:${j2ee.server.home}/lib/catalina-tribes.jar:${j2ee.server.home}/lib/catalina.jar:${j2ee.server.home}/lib/ecj-4.6.3.jar:${j2ee.server.home}/lib/el-api.jar:${j2ee.server.home}/lib/jasper-el.jar:${j2ee.server.home}/lib/jasper.jar:${j2ee.server.home}/lib/jaspic-api.jar:${j2ee.server.home}/lib/jsp-api.jar:${j2ee.server.home}/lib/servlet-api.jar:${j2ee.server.home}/lib/tomcat-api.jar:${j2ee.server.home}/lib/tomcat-coyote.jar:${j2ee.server.home}/lib/tomcat-dbcp.jar:${j2ee.server.home}/lib/tomcat-i18n-de.jar:${j2ee.server.home}/lib/tomcat-i18n-es.jar:${j2ee.server.home}/lib/tomcat-i18n-fr.jar:${j2ee.server.home}/lib/tomcat-i18n-ja.jar:${j2ee.server.home}/lib/tomcat-i18n-ko.jar:${j2ee.server.home}/lib/tomcat-i18n-ru.jar:${j2ee.server.home}/lib/tomcat-i18n-zh-CN.jar:${j2ee.server.home}/lib/tomcat-jdbc.jar:${j2ee.server.home}/lib/tomcat-jni.jar:${j2ee.server.home}/lib/tomcat-util-scan.jar:${j2ee.server.home}/lib/tomcat-util.jar:${j2ee.server.home}/lib/tomcat-websocket.jar:${j2ee.server.home}/lib/websocket-api.jar |
| #Mon Nov 09 10:36:44 MST 2015 |
| javadoc.splitindex=true |
| lib.dir=${web.docbase.dir}/WEB-INF/lib |
| @@ -42,8 +42,8 @@ |
| auxiliary.org-netbeans-modules-css-prep.less_2e_enabled=false |
| javadoc.notree=false |
| source.root=src |
| -runmain.jvmargs= |
| -platform.active=default_platform |
| +runmain.jvmargs=-Dcsip-context="od" |
| +platform.active=JDK_1.8 |
| javadoc.preview=true |
| j2ee.deploy.on.save=false |
| annotation.processing.enabled=true |
| @@ -10,6 +10,7 @@ |
| <data xmlns="http://www.netbeans.org/ns/web-project/3"> |
| <name>csip-example</name> |
| <minimum-ant-version>1.6.5</minimum-ant-version> |
| + <explicit-platform explicit-source-supported="true"/> |
| <web-module-libraries> |
| <library dirs="200"> |
| <file>${libs.CSIP-Jersey-2.16.classpath}</file> |
| @@ -5,7 +5,7 @@ |
| */ |
| package client.example; |
| -import csip.Client; |
| +import csip.utils.Client; |
| import org.codehaus.jettison.json.JSONObject; |
| /** |
| @@ -5,13 +5,10 @@ |
| package m.example; |
| import csip.Config; |
| -import csip.ContextConfig; |
| -import java.util.HashSet; |
| import java.util.Set; |
| import javax.servlet.ServletContext; |
| import javax.ws.rs.core.Application; |
| import javax.ws.rs.core.Context; |
| -import org.glassfish.jersey.media.multipart.MultiPartFeature; |
| /** |
| * |
| @@ -28,8 +25,7 @@ |
| public Set<Class<?>> getClasses() { |
| Set<Class<?>> resources = new java.util.HashSet<>(); |
| addRestResourceClasses(resources); |
| - ContextConfig.filterServices(context, resources); |
| - Config.register(resources); |
| + Config.register(resources, context); |
| return resources; |
| } |
| @@ -46,13 +42,14 @@ |
| resources.add(csip.DynamicPyModelDataService.class); |
| resources.add(csip.GzipWriterInterceptor.class); |
| resources.add(csip.QueryService.class); |
| - resources.add(csip.QueueingModelDataService.class); |
| resources.add(csip.ReportService.class); |
| resources.add(csip.UIService.class); |
| resources.add(m.example.externalexe.V1_0.class); |
| + resources.add(m.example.externalexe.V2_0.class); |
| resources.add(m.example.jdbc.V1_0.class); |
| resources.add(m.example.logging.V1_0.class); |
| resources.add(m.example.py.V1_0.class); |
| + resources.add(m.example.simpleservice.RosenV1.class); |
| resources.add(m.example.simpleservice.V1_0.class); |
| resources.add(m.example.simpleservice.V1_01.class); |
| resources.add(m.example.simpleservice.V2_0.class); |
| @@ -6,7 +6,7 @@ |
| package m.example.externalexe; |
| import csip.ModelDataService; |
| -import csip.Executable; |
| +import csip.api.server.Executable; |
| import csip.annotations.*; |
| import static csip.annotations.ResourceType.*; |
| import javax.ws.rs.Path; |
| @@ -6,10 +6,8 @@ |
| package m.example.jdbc; |
| import csip.ModelDataService; |
| -import csip.ServiceException; |
| -import csip.SessionLogger; |
| +import csip.api.server.ServiceException; |
| import csip.annotations.*; |
| -import csip.utils.Binaries; |
| import java.sql.Connection; |
| import java.sql.ResultSet; |
| import java.sql.SQLException; |
| @@ -7,7 +7,7 @@ |
| import csip.ModelDataService; |
| import javax.ws.rs.Path; |
| -import oms3.annotations.*; |
| +import csip.annotations.*; |
| /** |
| * Fahrenheit conversion. |
| @@ -30,4 +30,9 @@ |
| @Path("m/py/1.0") |
| public class V1_0 extends csip.ModelDataService { |
| + |
| + @Override |
| + protected void doProcess() throws Exception { |
| + } |
| + |
| } |
| @@ -7,7 +7,7 @@ |
| import csip.ModelDataService; |
| import javax.ws.rs.Path; |
| -import oms3.annotations.*; |
| +import csip.annotations.*; |
| /** |
| * Fahrenheit conversion. |
| @@ -7,7 +7,7 @@ |
| import csip.ModelDataService; |
| import javax.ws.rs.Path; |
| -import oms3.annotations.*; |
| +import csip.annotations.*; |
| import org.apache.commons.io.FileUtils; |
| /** |
| @@ -24,9 +24,9 @@ |
| @Override |
| protected void doProcess() throws Exception { |
| - FileUtils.writeStringToFile(getWorkspaceFile("abc"), "string content"); |
| + FileUtils.writeStringToFile(workspace().getFile("abc"), "string content", "UTF-8"); |
| - results().put(getWorkspaceFile("abc")); |
| + results().put(workspace().getFile("abc")); |
| //// System.out.println("File " + getFileInput("test.txt")); |
| // System.out.println("File " + attachments().getFile("test.txt")); |
| @@ -5,7 +5,7 @@ |
| */ |
| package m.example.simpleservice; |
| -import csip.ServiceException; |
| +import csip.api.server.ServiceException; |
| import javax.ws.rs.Path; |
| import static csip.annotations.State.*; |
| import csip.annotations.*; |
| @@ -21,14 +21,16 @@ |
| @Category("Climate") |
| @Path("m/simpleservice/2.0") |
| +@Polling(first = 1000, next = 1000) |
| public class V2_0 extends csip.ModelDataService { |
| @Override |
| protected void doProcess() throws Exception { |
| + |
| + System.out.println(config().getServiceKey()); |
| int sleep = parameter().getInt("sleep", 25); |
| boolean b = parameter().getBoolean("b", true); |
| System.out.println("Value " + sleep + " " + b); |
| -// Thread.sleep(sleep); |
| double temp = parameter().getDouble("temp"); |
| String un = parameter().getUnit("temp"); |
| if (un.equals("C")) { |
| @@ -5,10 +5,10 @@ |
| */ |
| package m.example.simpleservice; |
| -import csip.ServiceException; |
| import javax.ws.rs.Path; |
| import static csip.annotations.State.*; |
| import csip.annotations.*; |
| +import java.io.File; |
| import java.util.ArrayList; |
| import java.util.List; |
| @@ -23,16 +23,17 @@ |
| @Category("Climate") |
| @Path("m/simpleservice/2.1") |
| -public class V2_0_1 extends csip.ModelDataService { |
| +public class V2_0_1 extends V2_0 { |
| @Override |
| protected void doProcess() throws Exception { |
| - |
| - long[] f = new long[5]; |
| - List l = new ArrayList(); |
| - for (double i = 0; i < 5; i++) { |
| - f[(int)i] = (long)i; |
| - } |
| - results().put("temp", f, "test", "F"); |
| + |
| + File f = workspace().getFile("abc.txt"); |
| + f.createNewFile(); |
| + |
| + File f1 = workspace().writeString("abc1.txt", "data"); |
| + |
| + results().put(f); |
| + results().put(f1); |
| } |
| } |
| @@ -6,29 +6,29 @@ |
| package m.example.simpleservice; |
| import csip.annotations.*; |
| -import oms3.annotations.Unit; |
| -import oms3.annotations.Description; |
| -import oms3.annotations.In; |
| -import oms3.annotations.Out; |
| -import oms3.annotations.Execute; |
| +//import oms3.annotations.Unit; |
| +//import oms3.annotations.Description; |
| +//import oms3.annotations.In; |
| +//import oms3.annotations.Out; |
| +//import oms3.annotations.Execute; |
| import javax.ws.rs.Path; |
| @Name("Temperature conversion.") |
| @Path("m/conv/1.0") |
| -@Resource(type = ResourceType.OMS_COMP) |
| -public class V3 extends csip.ModelDataService { |
| +//@Resource(type = ResourceType.OMS_COMP) |
| +public class V3 { |
| - @Description("Temperature in C") |
| - @Unit("C") |
| - @In public double temp_c = 45.2; |
| - |
| - @Description("Temperature in F") |
| - @Unit("F") |
| - @Out public double temp_f; |
| - |
| - |
| - @Execute |
| - public void exec() throws Exception { |
| - temp_f = temp_c * 9 / 5 + 32; |
| - } |
| +// @Description("Temperature in C") |
| +// @Unit("C") |
| +// @In public double temp_c = 45.2; |
| +// |
| +// @Description("Temperature in F") |
| +// @Unit("F") |
| +// @Out public double temp_f; |
| +// |
| +// |
| +// @Execute |
| +// public void exec() throws Exception { |
| +// temp_f = temp_c * 9 / 5 + 32; |
| +// } |
| } |
| @@ -11,7 +11,7 @@ |
| import java.util.List; |
| import java.util.Map; |
| import javax.ws.rs.Path; |
| -import oms3.annotations.*; |
| +import csip.annotations.*; |
| import org.codehaus.jettison.json.JSONArray; |
| import org.codehaus.jettison.json.JSONObject; |
| @@ -8,8 +8,8 @@ |
| import csip.ModelDataService; |
| import javax.ws.rs.Path; |
| -import oms3.annotations.Description; |
| -import oms3.annotations.Name; |
| +import csip.annotations.Description; |
| +import csip.annotations.Name; |
| import org.apache.commons.io.FileUtils; |
| /** |
| @@ -23,8 +23,8 @@ |
| @Override |
| protected void doProcess() throws Exception { |
| - FileUtils.writeStringToFile(getWorkspaceFile("test.txt"), "content"); |
| - results().put(getWorkspaceFile("test.txt")); |
| + FileUtils.writeStringToFile(workspace().getFile("test.txt"), "content", "utf-8"); |
| + results().put(workspace().getFile("test.txt")); |
| } |
| } |
| @@ -14,5 +14,6 @@ |
| "csip.response.stacktrace": true, |
| "csip.publisher.backend":"none", |
| "csip.publisher.kafka.topic":"8080", |
| - "csip.publisher.kafka.bootstrap_servers" : "perams10.engr.colostate.edu:9092" |
| + "csip.publisher.kafka.bootstrap_servers" : "perams10.engr.colostate.edu:9092", |
| + "watershed.python3": "python3" |
| } |