You can subscribe to this list here.
2009 |
Jan
|
Feb
(28) |
Mar
(85) |
Apr
(81) |
May
(32) |
Jun
(51) |
Jul
(134) |
Aug
(21) |
Sep
|
Oct
|
Nov
|
Dec
|
---|
From: <pka...@us...> - 2009-03-25 09:43:20
|
Revision: 112 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=112&view=rev Author: pkasprzak Date: 2009-03-25 09:43:09 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/XSLTTransform/build.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/catalog.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/ant-deploy.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jax-ws.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jaxws-build.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.properties trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.xml trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/MANIFEST.MF trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/XSLTTransform/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/XSLTTransform/DataTypes.xsd trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/XSLTTransform/XSLTTransform.wsdl trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/xml-resources/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/xml-resources/web-services/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/xml-resources/web-services/XSLTTransform/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/xml-resources/web-services/XSLTTransform/wsdl/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/xml-resources/web-services/XSLTTransform/wsdl/DataTypes.xsd trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/xml-resources/web-services/XSLTTransform/wsdl/XSLTTransform.wsdl trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/InboundTransformation.xsl trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/de/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/de/campussource/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/de/campussource/cse/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/de/campussource/cse/xslttransform/ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/java/de/campussource/cse/xslttransform/XSLTTransform.java trunk/sandbox/lsf-adapter-demo/XSLTTransform/test/ Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/build.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See commented blocks below for --> +<!-- some examples of how to customize the build. --> +<!-- (If you delete it and reopen the project it will be recreated.) --> +<!-- By default, only the Clean and Build commands use this build script. --> +<!-- Commands such as Run, Debug, and Test only use this build script if --> +<!-- the Compile on Save feature is turned off for the project. --> +<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> +<!-- in the project's Project Properties dialog box.--> +<project name="XSLTTransform" default="default" basedir="." xmlns:ejbjarproject="http://www.netbeans.org/ns/j2ee-ejbjarproject/3"> + <description>Builds, tests, and runs the project XSLTTransform.</description> + <import file="nbproject/build-impl.xml"/> + <!-- + + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: + + -pre-init: called before initialization of project properties + -post-init: called after initialization of project properties + -pre-compile: called before javac compilation + -post-compile: called after javac compilation + -pre-compile-single: called before javac compilation of single file + -post-compile-single: called after javac compilation of single file + -pre-dist: called before archive building + -post-dist: called after archive building + -post-clean: called after cleaning build products + -pre-run-deploy: called before deploying + -post-run-deploy: called after deploying + + (Targets beginning with '-' are not intended to be called on their own.) + + Example of pluging an obfuscator after the compilation could look like + + <target name="-post-compile"> + <obfuscate> + <fileset dir="${build.classes.dir}"/> + </obfuscate> + </target> + + For list of available properties check the imported + nbproject/build-impl.xml file. + + + Other way how to customize the build is by overriding existing main targets. + The target of interest are: + + init-macrodef-javac: defines macro for javac compilation + init-macrodef-debug: defines macro for class debugging + do-dist: archive building + run: execution of project + javadoc-build: javadoc generation + + Example of overriding the target for project execution could look like + + <target name="run" depends="<PROJNAME>-impl.jar"> + <exec dir="bin" executable="launcher.exe"> + <arg file="${dist.jar}"/> + </exec> + </target> + + Notice that overridden target depends on jar target and not only on + compile target as regular run target does. Again, for list of available + properties which you can use check the target you are overriding in + nbproject/build-impl.xml file. + + --> +</project> Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/catalog.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/catalog.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/newWSDL.wsdl" uri="src/conf/xml-resources/web-services/NewWebServiceFromWSDL/wsdl/newWSDL.wsdl"/> + <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/XSLTTransform.wsdl" uri="src/conf/xml-resources/web-services/XSLTTransform/wsdl/XSLTTransform.wsdl"/> + <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/DataTypes.xsd" uri="src/conf/xml-resources/web-services/XSLTTransform/wsdl/DataTypes.xsd"/> +</catalog> \ No newline at end of file Property changes on: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/ant-deploy.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/ant-deploy.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/ant-deploy.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="-deploy-ant" basedir="."> + <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> + <property file="${deploy.ant.properties.file}" /> + <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/> + <available file="${deploy.ant.resource.dir}" property="has.setup"/> + <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> + <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/> + </target> + + <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present"> + <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/> + <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/> + <!-- The doctype triggers resolution which can fail --> + <replace file="${temp.sun.web}"> + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken> + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue> + </replace> + <replace file="${temp.sun.web}"> + <replacetoken><![CDATA[<sun-web-app]]></replacetoken> + <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue> + </replace> + <xmlproperty file="${temp.sun.web}" validate="false"> + </xmlproperty> + <delete file="${temp.sun.web}"/> + <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/> + </target> + <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup"> + <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/> + <mkdir dir="${sjsas.resources.dir}"/> + <mkdir dir="${sjsas.resources.dir}/META-INF"/> + <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/> + <copy todir="${sjsas.resources.dir}/META-INF"> + <fileset dir="${deploy.ant.resource.dir}"/> + </copy> + <jar destfile="${deploy.ant.archive}" update="true"> + <fileset dir="${sjsas.resources.dir}"/> + </jar> + <delete dir="${sjsas.resources.dir}"/> + </target> + <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled"> + <echo message="Deploying ${deploy.ant.archive}"/> + <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask" + classpath="${sjsas.root}/lib/sun-appserv-ant.jar" /> + <sun-appserv-deploy user="${sjsas.username}" + passwordfile="${sjsas.password.file}" + host="${sjsas.host}" port="${sjsas.port}" + file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/> + <delete file="${sjsas.password.file}"/> + </target> + <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled"> + <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask" + classpath="${sjsas.root}/lib/sun-appserv-ant.jar" /> + <sun-appserv-undeploy user="${sjsas.username}" + passwordfile="${sjsas.password.file}" + host="${sjsas.host}" port="${sjsas.port}" + file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/> + <delete file="${sjsas.password.file}"/> + </target> +</project> Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/build-impl.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/build-impl.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,572 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +*** GENERATED FROM project.xml - DO NOT EDIT *** +*** EDIT ../build.xml INSTEAD *** + +For the purpose of easier reading the script +is divided into following sections: + + - initialization + - compilation + - dist + - execution + - debugging + - javadoc + - cleanup + + --> +<project xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" basedir=".." default="default" name="XSLTTransform-impl"> + <import file="jaxws-build.xml"/> + <import file="ant-deploy.xml"/> + <target depends="dist,javadoc" description="Build whole project." name="default"/> + <!-- + INITIALIZATION SECTION + --> + <target name="-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-pre-init" name="-init-private"> + <property file="nbproject/private/private.properties"/> + </target> + <target depends="-pre-init,-init-private" name="-init-userdir"> + <property location="${netbeans.user}/build.properties" name="user.properties.file"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir" name="-init-user"> + <property file="${user.properties.file}"/> + <!-- The two properties below are usually overridden --> + <!-- by the active platform. Just a fallback. --> + <property name="default.javac.source" value="1.4"/> + <property name="default.javac.target" value="1.4"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user" name="-init-project"> + <property file="nbproject/project.properties"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-init-macrodef-property" name="-do-init"> + <!-- Ensure configuration directory exists. --> + <mkdir dir="${meta.inf}"/> + <property name="runmain.jvmargs" value=""/> + <condition property="have.tests"> + <or> + <available file="${test.src.dir}"/> + </or> + </condition> + <condition property="have.sources"> + <or> + <available file="${src.dir}"/> + </or> + </condition> + <condition property="netbeans.home+have.tests"> + <and> + <isset property="netbeans.home"/> + <isset property="have.tests"/> + </and> + </condition> + <condition property="no.javadoc.preview"> + <isfalse value="${javadoc.preview}"/> + </condition> + <available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/> + <condition property="classes.dir" value="${build.ear.classes.dir}"> + <isset property="dist.ear.dir"/> + </condition> + <property name="classes.dir" value="${build.classes.dir}"/> + <condition property="no.deps"> + <and> + <istrue value="${no.dependencies}"/> + </and> + </condition> + <condition property="no.dist.ear.dir"> + <not> + <isset property="dist.ear.dir"/> + </not> + </condition> + <property name="source.encoding" value="${file.encoding}"/> + <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> + <and> + <isset property="javadoc.encoding"/> + <not> + <equals arg1="${javadoc.encoding}" arg2=""/> + </not> + </and> + </condition> + <property name="javadoc.encoding.used" value="${source.encoding}"/> + <property name="includes" value="**"/> + <property name="excludes" value=""/> + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> + <and> + <isset property="jaxws.endorsed.dir"/> + <available file="nbproject/jaxws-build.xml"/> + </and> + </condition> + </target> + <target depends="init" name="-init-cos" unless="deploy.on.save"> + <condition property="deploy.on.save" value="true"> + <istrue value="${j2ee.deploy.on.save}"/> + </condition> + </target> + <target name="-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init" name="-init-check"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="test.src.dir">Must set test.src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="build.generated.dir">Must set build.generated.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="build.classes.dir">Must set build.classes.dir</fail> + <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail> + <fail unless="build.classes.excludes">Must set build.classes.excludes</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + <fail unless="j2ee.platform.classpath"> +The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. +Either open the project in the IDE and assign the server or setup the server classpath manually. +For example like this: + ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) +or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) + </fail> + </target> + <target name="-init-macrodef-property"> + <macrodef name="property" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute name="name"/> + <attribute name="value"/> + <sequential> + <property name="@{name}" value="${@{value}}"/> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-javac"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2"> + <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <element name="customize" optional="true"/> + <sequential> + <property name="javac.compilerargs" value=""/> + <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}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> + <customize/> + </javac> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-junit"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2"> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <sequential> + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> + <batchtest todir="${build.test.results.dir}"> + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + </batchtest> + <classpath> + <path path="${run.test.classpath}"/> + <path path="${j2ee.platform.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <jvmarg line="${runmain.jvmargs}"/> + </junit> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-java"> + <macrodef name="java" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/3"> + <attribute default="${main.class}" name="classname"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" fork="true"> + <jvmarg line="${runmain.jvmargs}"/> + <classpath> + <path path="${build.classes.dir}:${javac.classpath}:${j2ee.platform.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> + <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute default="${main.class}" name="name"/> + <attribute default="${debug.classpath}" name="classpath"/> + <sequential> + <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + </nbjpdastart> + </sequential> + </macrodef> + <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute default="${build.classes.dir}" name="dir"/> + <sequential> + <nbjpdareload> + <fileset dir="@{dir}" includes="${fix.classes}"> + <include name="${fix.includes}*.class"/> + </fileset> + </nbjpdareload> + </sequential> + </macrodef> + <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1"> + <sequential> + <nbjpdaappreloaded/> + </sequential> + </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> + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}"> + <isset property="debug.transport"/> + </condition> + </target> + <target depends="-init-debug-args" name="-init-macrodef-debug"> + <macrodef name="debug" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute default="${main.class}" name="classname"/> + <attribute default="${debug.classpath}" name="classpath"/> + <attribute default="${application.args}" name="args"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" fork="true"> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <classpath> + <path path="@{classpath}"/> + </classpath> + <arg line="@{args}"/> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target name="-init-taskdefs"> + <fail unless="libs.CopyLibs.classpath"> +The libs.CopyLibs.classpath property is not set up. +This property must point to +org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part +of NetBeans IDE installation and is usually located at +<netbeans_installation>/java<version>/ant/extra folder. +Either open the project in the IDE and make sure CopyLibs library +exists or setup the property manually. For example like this: + ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar + </fail> + <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs" name="init"/> + <!-- + COMPILATION SECTION + --> + <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps"/> + <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps"/> + <target depends="init, -deps-module-jar, -deps-ear-jar" name="deps-jar"/> + <target depends="init,deps-jar,wsimport-service-generate" name="-pre-pre-compile"> + <mkdir dir="${build.classes.dir}"/> + <mkdir dir="${build.ear.classes.dir}"/> + </target> + <target name="-pre-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="compile" name="library-inclusion-in-archive"/> + <target depends="compile" name="library-inclusion-in-manifest"> + <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/> + </target> + <target name="-copy-meta-inf"> + <copy todir="${classes.dir}"> + <fileset dir="${meta.inf}" includes="**/*.dbschema"/> + </copy> + <copy todir="${classes.dir}/META-INF"> + <fileset dir="${meta.inf}" excludes="**/*.dbschema **/xml-resources/** ${meta.inf.excludes}"/> + </copy> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-copy-meta-inf,wsimport-service-compile" if="have.sources" name="-do-compile"> + <ejbjarproject2:javac destdir="${classes.dir}"/> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + </copy> + </target> + <target name="-post-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> + <target name="-pre-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile,wsimport-service-compile" name="-do-compile-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <ejbjarproject2:javac excludes="" includes="${javac.includes}"/> + </target> + <target name="-post-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> + <!-- + DIST BUILDING SECTION + --> + <target name="-pre-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-dist,library-inclusion-in-archive" if="has.custom.manifest" name="-do-dist-with-manifest"> + <dirname file="${dist.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${build.classes.dir}/META-INF/MANIFEST.MF"> + <fileset dir="${build.classes.dir}"/> + </jar> + </target> + <target depends="init,compile,-pre-dist,library-inclusion-in-archive" name="-do-dist-without-manifest" unless="has.custom.manifest"> + <dirname file="${dist.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.jar}"> + <fileset dir="${build.classes.dir}"/> + </jar> + </target> + <target depends="init,compile,-pre-dist,library-inclusion-in-archive, -do-dist-without-manifest, -do-dist-with-manifest" name="-do-dist"/> + <target depends="init,compile,-pre-dist,library-inclusion-in-manifest" name="-do-ear-dist"> + <dirname file="${dist.ear.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.ear.jar}" manifest="${build.ear.classes.dir}/META-INF/MANIFEST.MF"> + <fileset dir="${build.ear.classes.dir}"/> + </jar> + </target> + <target name="-post-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-dist,-do-dist,-post-dist" description="Build distribution (JAR)." name="dist"/> + <target depends="init,-init-cos,compile,-pre-dist,-do-ear-dist,-post-dist" description="Build distribution (JAR) to be packaged into an EAR." name="dist-ear"/> + <!-- + EXECUTION SECTION + --> + <target depends="run-deploy" description="Deploy to server." name="run"/> + <target name="-init-deploy"> + <property name="include.jar.manifest" value=""/> + </target> + <target name="pre-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="post-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-pre-nbmodule-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. --> + </target> + <target name="-post-nbmodule-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. --> + </target> + <target name="-run-deploy-am"> + <!-- Task to deploy to the Access Manager runtime. --> + </target> + <target depends="init,-init-cos,-init-deploy,compile,library-inclusion-in-archive,dist,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"> + <nbjpdaappreloaded/> + </target> + <target if="netbeans.home" name="-run-deploy-nb"> + <nbdeploy debugmode="false" forceRedeploy="${forceRedeploy}"/> + </target> + <target name="-init-deploy-ant" unless="netbeans.home"> + <property name="deploy.ant.archive" value="${dist.jar}"/> + <property name="deploy.ant.resource.dir" value="${resource.dir}"/> + <property name="deploy.ant.enabled" value="true"/> + </target> + <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/> + <target if="netbeans.home" name="-run-undeploy-nb"> + <fail message="Undeploy is not supported from within the IDE"/> + </target> + <target depends="dist" name="verify"> + <nbverify file="${dist.jar}"/> + </target> + <target depends="init,compile-single" name="run-main"> + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> + <ejbjarproject3:java classname="${run.class}"/> + </target> + <!-- + DEBUGGING SECTION + --> + <target depends="init,compile,dist" description="Debug project in IDE." if="netbeans.home" name="debug"> + <nbdeploy debugmode="true"/> + <antcall target="connect-debugger"/> + </target> + <target name="connect-debugger" unless="is.debugged"> + <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}"> + <classpath> + <path path="${debug.classpath}"/> + </classpath> + <sourcepath> + <path path="${web.docbase.dir}"/> + </sourcepath> + </nbjpdaconnect> + </target> + <target depends="init" if="netbeans.home" name="-debug-start-debugger"> + <ejbjarproject1:nbjpdastart/> + </target> + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single"> + <fail unless="main.class">Must select one file in the IDE or set main.class</fail> + <ejbjarproject1:debug/> + </target> + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/> + <target depends="init" name="-pre-debug-fix"> + <fail unless="fix.includes">Must set fix.includes</fail> + <property name="javac.includes" value="${fix.includes}.java"/> + </target> + <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix"> + <ejbjarproject1:nbjpdareload/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> + <!-- + JAVADOC SECTION + --> + <target depends="init" 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}"> + <classpath> + <path path="${javac.classpath}:${j2ee.platform.classpath}"/> + </classpath> + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> + </javadoc> + </target> + <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview"> + <nbbrowse file="${dist.javadoc.dir}/index.html"/> + </target> + <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/> + <!-- + JUNIT COMPILATION SECTION + --> + <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> + <mkdir dir="${build.test.classes.dir}"/> + </target> + <target name="-pre-compile-test"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test"> + <ejbjarproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> + <copy todir="${build.test.classes.dir}"> + <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + </copy> + </target> + <target name="-post-compile-test"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/> + <target name="-pre-compile-test-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <ejbjarproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/> + </target> + <target name="-post-compile-test-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/> + <!-- + JUNIT EXECUTION SECTION + --> + <target depends="init" if="have.tests" name="-pre-test-run"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> + <ejbjarproject2:junit testincludes="**/*Test.java"/> + </target> + <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init" if="have.tests" name="test-report"/> + <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> + <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/> + <target depends="init" if="have.tests" name="-pre-test-run-single"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> + <ejbjarproject2:junit excludes="" includes="${test.includes}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> + <!-- + JUNIT DEBUGGING SECTION + --> + <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> + <fail unless="test.class">Must select one file in the IDE or set test.class</fail> + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> + <delete file="${test.report.file}"/> + <!-- the directory must exist, otherwise the XML formatter would fail --> + <mkdir dir="${build.test.results.dir}"/> + <ejbjarproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}"> + <customize> + <arg value="showoutput=true"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> + </customize> + </ejbjarproject1:debug> + </target> + <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> + <ejbjarproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> + </target> + <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> + <ejbjarproject1:nbjpdareload dir="${build.test.classes.dir}"/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> + <!-- + CLEANUP SECTION + --> + <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/> + <target depends="init" name="-do-clean"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + </target> + <target name="-post-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init" if="netbeans.home" name="undeploy-clean"> + <nbundeploy failOnError="false" startServer="false"/> + </target> + <target depends="init,undeploy-clean,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> + <target depends="clean" name="clean-ear"/> +</project> Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/genfiles.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/genfiles.properties 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,9 @@ +build.xml.data.CRC32=2d9487f4 +build.xml.script.CRC32=b2676697 +build.xml.stylesheet.CRC32=e5f4c432 +# 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=2d9487f4 +nbproject/build-impl.xml.script.CRC32=977ce94f +nbproject/build-impl.xml.stylesheet.CRC32=36c39d59 +nbproject/jaxws-build.xml.stylesheet.CRC32=f49c6152 Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jax-ws.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jax-ws.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jax-ws.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1"> + <services> + <service name="XSLTTransform"> + <implementation-class>de.campussource.cse.xslttransform.XSLTTransform</implementation-class> + <wsdl-url>file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/XSLTTransform.wsdl</wsdl-url> + <local-wsdl-file>XSLTTransform.wsdl</local-wsdl-file> + <service-name>XSLTTransformService</service-name> + <port-name>XSLTTransformPort</port-name> + <package-name>org.netbeans.j2ee.wsdl.lsfclientadapter.xslttransform</package-name> + <catalog-file>catalog.xml</catalog-file> + <use-provider>false</use-provider> + <wsimport-options> + <wsimport-option> + <wsimport-option-name>extension</wsimport-option-name> + <wsimport-option-value>true</wsimport-option-value> + </wsimport-option> + <wsimport-option> + <wsimport-option-name>verbose</wsimport-option-name> + <wsimport-option-value>true</wsimport-option-value> + </wsimport-option> + <wsimport-option> + <wsimport-option-name>xnocompile</wsimport-option-name> + <wsimport-option-value>true</wsimport-option-value> + </wsimport-option> + </wsimport-options> + </service> + </services> + <clients/> +</jax-ws> Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jaxws-build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jaxws-build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/jaxws-build.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1"> + <!-- + =================== + JAX-WS WSGEN SECTION + =================== + --> + <!-- + =================== + JAX-WS WSIMPORT SECTION + =================== + --> + <target name="wsimport-init" depends="init"> + <mkdir dir="${build.generated.dir}/wsimport/service"/> + <mkdir dir="${build.generated.dir}/wsimport/binaries"/> + <mkdir dir="${classes.dir}"/> + <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> + <classpath path="${j2ee.platform.wsimport.classpath}"/> + </taskdef> + </target> + <target name="wsimport-service-check-XSLTTransform" depends="wsimport-init"> + <condition property="wsimport-service-XSLTTransform.notRequired"> + <available file="${build.generated.dir}/wsimport/service/org/netbeans/j2ee/wsdl/lsfclientadapter/xslttransform/XSLTTransformService.java"/> + </condition> + </target> + <target name="wsimport-service-XSLTTransform" depends="wsimport-init,wsimport-service-check-XSLTTransform" unless="wsimport-service-XSLTTransform.notRequired"> + <property name="service-wsdl-XSLTTransform" location="${meta.inf}/xml-resources/web-services/XSLTTransform/wsdl/XSLTTransform.wsdl"/> + <wsimport sourcedestdir="${build.generated.dir}/wsimport/service" destdir="${build.generated.dir}/wsimport/binaries" wsdl="${service-wsdl-XSLTTransform}" catalog="catalog.xml" extension="true" verbose="true" xnocompile="true"/> + <property name="targetLocation-XSLTTransform" location="${meta.inf}/wsdl/XSLTTransform"/> + <property name="sourceLocation-XSLTTransform" location="${meta.inf}/xml-resources/web-services/XSLTTransform/wsdl/"/> + <copy todir="${targetLocation-XSLTTransform}"> + <fileset dir="${sourceLocation-XSLTTransform}"/> + </copy> + </target> + <target name="wsimport-service-clean-XSLTTransform" depends="-init-project"> + <delete dir="${build.generated.dir}/wsimport/service/org/netbeans/j2ee/wsdl/lsfclientadapter/xslttransform"/> + </target> + <target name="wsimport-service-generate" depends="wsimport-service-XSLTTransform"/> + <target name="wsimport-service-compile" depends="wsimport-service-generate"> + <ejbjarproject2:javac srcdir="${build.generated.dir}/wsimport/service" classpath="${j2ee.platform.wsimport.classpath}:${javac.classpath}" destdir="${classes.dir}"/> + </target> +</project> Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.properties 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,57 @@ +build.classes.dir=${build.dir}/jar +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.ear.classes.dir=${build.dir}/jar +build.generated.dir=${build.dir}/generated +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +debug.classpath=${javac.classpath}:${build.classes.dir} +debug.test.classpath=\ + ${run.test.classpath} +dist.dir=dist +dist.ear.jar=${dist.dir}/${jar.name} +dist.jar=${dist.dir}/${jar.name} +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +includes=** +j2ee.deploy.on.save=true +j2ee.platform=1.5 +j2ee.server.type=J2EE +jar.compress=false +jar.name=XSLTTransform.jar +javac.classpath= +javac.debug=true +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.preview=true +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +meta.inf=${source.root}/conf +meta.inf.excludes=sun-cmp-mappings.xml +platform.active=default_platform +resource.dir=setup +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +# Space-separated list of JVM arguments used when running a class with a main method or a unit test +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): +runmain.jvmargs= +source.encoding=UTF-8 +source.root=src +src.dir=${source.root}/java +test.src.dir=test Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/nbproject/project.xml 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.j2ee.ejbjarproject</type> + <configuration> + <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1"> + <extension file="jaxws-build.xml" id="jaxws"> + <dependency dependsOn="wsimport-service-compile" target="-do-compile"/> + <dependency dependsOn="wsimport-service-compile" target="-do-compile-single"/> + <dependency dependsOn="wsimport-service-generate" target="-pre-pre-compile"/> + </extension> + </buildExtensions> + <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3"> + <name>XSLTTransform</name> + <minimum-ant-version>1.6.5</minimum-ant-version> + <source-roots> + <root id="src.dir" name="Source Packages"/> + </source-roots> + <test-roots> + <root id="test.src.dir" name="Test Packages"/> + </test-roots> + </data> + </configuration> +</project> Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/MANIFEST.MF =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/MANIFEST.MF (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/MANIFEST.MF 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + Added: trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/XSLTTransform/DataTypes.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/XSLTTransform/DataTypes.xsd (rev 0) +++ trunk/sandbox/lsf-adapter-demo/XSLTTransform/src/conf/wsdl/XSLTTransform/DataTypes.xsd 2009-03-25 09:43:09 UTC (rev 112) @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://cse.campussource.de/schema/DataTypes" + xmlns:tns="http://cse.campussource.de/schema/DataTypes"> + + <xs:complexType name="synchronizationMessageType"> + <xs:sequence> + <xs:element name="isDebug" type="xs:boolean"/> + <xs:element name="isSyncMessage" type="xs:boolean"/> + <xs:element name="semesterName" type="xs:string" minOccurs="0"/> + <xs:element name="semesterLsfId" type="xs:string" minOccurs="0"/> + <xs:element name="rootCategoryId" type="xs:string" minOccurs="0"/> + <xs:element name="accounts" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="account" type="tns:accountType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="courseTypes" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="courseType" type="tns:courseTypeType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="courses" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="course" type="tns:courseType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="workgroups" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="workgroup" type="tns:workgroupType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="categories" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="category" type="tns:categoryType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="relations" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="relation" type="tns:mappedRelationType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="roles" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="role" type="tns:roleType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="lecturesToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="accountsToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="lectureTypesToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accountType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="surname" type="xs:string"/> + <xs:element name="firstName" type="xs:string"/> + <xs:element name="emailAddress" type="xs:string"/> + <xs:element name="login" type="xs:string"/> + <xs:element name="password" type="xs:string"/> + <xs:element name="globalRole" type="xs:string" minOccurs="0"/> + <xs:element name="degree" type="xs:string" minOccurs="0"/> + <xs:element name="academicTitle" type="xs:string" minOccurs="0"/> + <xs:element name="gender" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedEntityType" abstract="true"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedObjectType" abstract="true"> + <xs:sequence> + <xs:element name="busId" type="xs:int"/> + <xs:element name="clientId" type="xs:string" minOccurs="0"/> + <xs:element name="operation" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="courseTypeType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:int"/> + <xs:element name="name" type="xs:string"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="longDescription" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="courseType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="dates" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="date" type="tns:dateType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="active" type="xs:string" minOccurs="0"/> + <xs:element name="abbreviation" type="xs:string" minOccurs="0"/> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="logicalNumber" type="xs:int"/> + <xs:element name="type" type="xs:string" minOccurs="0"/> + <xs:element name="title" type="xs:string"/> + <xs:element name="semesterId" type="xs:string"/> + <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="prerequisites" type="xs:string" minOccurs="0"/> + <xs:element name="necessaryAssignment" type="xs:string" minOccurs="0"/> + <xs:element name="languageISO" type="xs:string" minOccurs="0"/> + <xs:element name="languageFull" type="xs:string" minOccurs="0"/> + <xs:element name="hyperlink" type="xs:string" minOccurs="0"/> + <xs:element name="hyperlinkname" type="xs:string" minOccurs="0"/> + <xs:element name="note" type="xs:string" minOccurs="0"/> + <xs:element name="comment" type="xs:string" minOccurs="0"/> + <xs:element name="semesterAsInt" type="xs:short"/> + <xs:element name="semesterAbbr" type="xs:string" minOccurs="0"/> + <xs:element name="semesterFull" type="xs:string" minOccurs="0"/> + <xs:element name="semesterPeriodsPerWeek" type="xs:int"/> + <xs:element name="expectedRegistrations" type="xs:int"/> + <xs:element name="maximumRegistrations... [truncated message content] |
From: <pka...@us...> - 2009-03-25 09:42:35
|
Revision: 111 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=111&view=rev Author: pkasprzak Date: 2009-03-25 09:42:31 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/XSLTTransform/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-03-25 09:41:41
|
Revision: 110 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=110&view=rev Author: pkasprzak Date: 2009-03-25 09:41:36 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/build.xml 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See commented blocks below for --> +<!-- some examples of how to customize the build. --> +<!-- (If you delete it and reopen the project it will be recreated.) --> +<project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <description>Builds, tests, and runs the project .</description> + <import file="nbproject/build-impl.xml"/> + <!-- + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: + + -pre-init called before initialization of project properties + -post-init called after initialization of project properties + -pre-compile called before javac compilation + -post-compile called after javac compilation + -pre-compile-single called before javac compilation of single file + -post-compile-single called after javac compilation of single file + -pre-dist called before jar building + -post-dist called after jar building + -post-clean called after cleaning build products + + Example of pluging an obfuscator after the compilation could look like + + <target name="post-compile"> + <obfuscate> + <fileset dir="${build.classes.dir}"/> + </obfuscate> + </target> + + For list of available properties check the imported + nbproject/build-impl.xml file. + + Other way how to customize the build is by overriding existing main targets. + The target of interest are: + + init-macrodef-javac defines macro for javac compilation + init-macrodef-debug defines macro for class debugging + do-dist jar archive building + run execution of project + javadoc-build javadoc generation + + Example of overriding the target for project execution could look like + + <target name="run" depends="<PROJNAME>-impl.jar"> + <exec dir="bin" executable="launcher.exe"> + <arg file="${dist.jar}"/> + </exec> + </target> + + Notice that overridden target depends on jar target and not only on + compile target as regular run target does. Again, for list of available + properties which you can use check the target you are overriding in + nbproject/build-impl.xml file. + --> + <target name="-check-netbeans-home"> + <condition property="no.netbeans.home"> + <not> + <isset property="netbeans.home"/> + </not> + </condition> + </target> + <target name="-init-caps" if="no.netbeans.home"> + <property file="${basedir}/nbproject/private/private.properties"/> + <property name="netbeans.home" value="${caps.netbeans.home}/platform9"/> + <property name="netbeans.user" value="${caps.netbeans.user}"/> + <property name="from.commandline" value="true"/> + </target> + <target name="-pre-init" depends="-check-netbeans-home,-init-caps"/> +</project> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/catalog.xml 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/> + <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/DataTypes.xsd" uri="src/DataTypes.xsd"/> + <system systemId="IdentityMapper/wsdl/IdentityMapperWS/IdentityMapper.wsdl" uri="nb-uri:IdentityMapper#src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl"/> + <system systemId="LSFClientAdapter/XSLTTransform.wsdl" uri="nb-uri:LSFClientAdapter#src/XSLTTransform.wsdl"/> +</catalog> Property changes on: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/build-impl.xml 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *** GENERATED FROM project.xml - DO NOT EDIT *** + *** EDIT ../build.xml INSTEAD *** + + For the purpose of easier reading the script + is divided into following sections: + + - initialization + - dist + - cleanup +--> +<project name="ObjectProcessor-impl" default="default" basedir=".."> + <target name="default" depends="dist_se" description="Build whole project."/> + <!-- + ====================== + INITIALIZATION SECTION + ====================== + --> + <target name="-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-init-private" depends="-pre-init"> + <property file="nbproject/private/private.properties"/> + </target> + <target name="-init-userdir" depends="-pre-init,-init-private"> + <property name="user.properties.file" location="${netbeans.user}/build.properties"/> + </target> + <target name="-init-user" depends="-pre-init,-init-private,-init-userdir"> + <property file="${user.properties.file}"/> + </target> + <target name="-init-project" depends="-pre-init,-init-private,-init-userdir,-init-user"> + <property file="nbproject/project.properties"/> + </target> + <target name="-do-init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project"> + <available file="${src.dir}/../retrieved" property="retrieved.exists"/> + </target> + <target name="-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-init-check" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + </target> + <target name="-init-taskdefs" if="from.commandline"> + <path id="ant.task.classpath"> + <pathelement location="${netbeans.home}/../ide10/modules/ext/resolver-1.2.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-apache-xml-resolver.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-project-ant.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-project-libraries.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-projectapi.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-projectuiapi.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-catalog.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-xam.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-schema-model.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-wsdl-model.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-retriever.jar"/> + <pathelement location="${netbeans.home}/../platform9/core/core.jar"/> + <pathelement location="${netbeans.home}/../platform9/core/org-openide-filesystems.jar"/> + <pathelement location="${netbeans.home}/../platform9/lib/boot.jar"/> + <pathelement location="${netbeans.home}/../platform9/lib/org-openide-modules.jar"/> + <pathelement location="${netbeans.home}/../platform9/lib/org-openide-util.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-dialogs.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-loaders.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-nodes.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-text.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-netbeans-modules-masterfs.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-netbeans-modules-queries.jar"/> + <pathelement location="${netbeans.home}/../soa2/ant/nblib/org-netbeans-modules-bpel-project.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-debugger-api.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-model.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-project.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-validation.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-soa-ui.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-soa-validation.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-compapp-projects-base.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/ext/jxpath/jxpath1.1.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-catalogsupport.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-search.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-wsdl-extensions.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-xpath.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-xpath-ext.jar"/> + </path> + <taskdef name="validate-project" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliValidateBpelProjectTask"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="generate-catalog-xml" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliGenerateCatalogTask"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="generate-jbi-xml" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliGenerateJbiDescriptorTask"> + <classpath refid="ant.task.classpath"/> + </taskdef> + </target> + <target name="init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-taskdefs"/> + <!-- + ===================== + DIST BUILDING SECTION + ===================== + --> + <target name="-pre-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-deps-jar-dist" depends="init" unless="${no.dependencies}"> + <ant target="dist" inheritall="false" dir="${project.IdentityMapper}"/> + </target> + <target name="-do-dist" depends="init,-pre-dist"> + <mkdir dir="${build.dir}"/> + <!--validation--> + <validate-project buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" buildDependentProjectDir="${basedir}/${build.dir}/dependentProjectFiles" classpathRef="ant.task.classpath" allowBuildWithError="${allow.build.with.error}" validation="${validation}"/> + <!-- copy all files from project source directory to build directory. --> + <copy todir="${build.dir}" preservelastmodified="true"> + <fileset includes="**/*.bpel,**/*.wsdl,**/*.xsd, **/*.xsl, **/*.xslt, **/*.jar" dir="${src.dir}"/> + </copy> + <generate-catalog-xml buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" classpathRef="ant.task.classpath"/> + <generate-jbi-xml buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" classpathRef="ant.task.classpath"/> + <jar compress="${jar.compress}" jarfile="${build.dir}/SEDeployment.jar"> + <fileset includes="**/*.bpel,**/*.wsdl,**/*.xsd, **/*.xsl, **/*.xslt, **/*.jar" excludes="SEDeployment.jar" dir="${basedir}/${build.dir}"/> + <fileset dir="${basedir}/${build.dir}"> + <include name="**/jbi.xml"/> + <include name="**/catalog.xml"/> + </fileset> + </jar> + </target> + <target name="-post-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="dist_se" depends="init,-pre-dist,-deps-jar-dist,-do-dist,-post-dist" description="Build distribution."/> + <!-- + =============== + CLEANUP SECTION + =============== + --> + <target name="-pre-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-deps-clean" depends="init" unless="${no.dependencies}"> + <ant target="clean" inheritall="false" dir="${project.IdentityMapper}"/> + </target> + <target name="-do-clean" depends="init,-pre-clean"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + </target> + <target name="-post-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="clean" depends="init,-pre-clean,-deps-clean,-do-clean,-post-clean" description="Clean build products."/> +</project> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/genfiles.properties 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,8 @@ +build.xml.data.CRC32=c13bb3ad +build.xml.script.CRC32=3d3dbc12 +build.xml.stylesheet.CRC32=1947459d +# 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=c13bb3ad +nbproject/build-impl.xml.script.CRC32=664bb067 +nbproject/build-impl.xml.stylesheet.CRC32=749ec361 Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.properties 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,30 @@ +allow.build.with.error=false +bcdeployment.jar=${build.dir}/BCDeployment.jar +build.classes.dir=${build.dir}/jar +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.generated.dir=${build.dir}/generated +com.sun.jbi.ui.devtool.jbi.description.application-sub-assembly=Represents this Service Unit +com.sun.jbi.ui.devtool.jbi.setype.prefix=sun-bpel-engine +debug.classpath=${javac.classpath}:${build.classes.dir} +dist.dir=dist +dist.jar=${dist.dir}/ObjectProcessor.zip +dist.javadoc.dir=${dist.dir}/javadoc +jar.compress=false +jar.name=ObjectProcessor.jar +javac.debug=true +javac.deprecation=false +javac.source=1.4 +javac.target=1.4 +jbi.se.type=sun-bpel-engine +jbi.service-unit.description=Represents this Service Unit +meta.inf=${source.root}/conf +platform.active=default_platform +project.IdentityMapper=../IdentityMapper +reference.IdentityMapper.dist=${project.IdentityMapper}/dist/IdentityMapper.jar +resource.dir=setup +sedeployment.jar=${build.dir}/SEDeployment.jar +source.encoding=UTF-8 +source.root=src +src.dir=${source.root} +wsdl.classpath= Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/nbproject/project.xml 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.bpel.project</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/j2ee-bpelpro/1"> + <name>ObjectProcessor</name> + <minimum-ant-version>1.6</minimum-ant-version> + </data> + <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> + <reference> + <foreign-project>IdentityMapper</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>dist</target> + <clean-target>clean</clean-target> + <id>dist</id> + </reference> + </references> + </configuration> +</project> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/DataTypes.xsd 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://cse.campussource.de/schema/DataTypes" + xmlns:tns="http://cse.campussource.de/schema/DataTypes"> + + <xs:complexType name="synchronizationMessageType"> + <xs:sequence> + <xs:element name="isDebug" type="xs:boolean"/> + <xs:element name="isSyncMessage" type="xs:boolean"/> + <xs:element name="semesterName" type="xs:string" minOccurs="0"/> + <xs:element name="semesterLsfId" type="xs:string" minOccurs="0"/> + <xs:element name="rootCategoryId" type="xs:string" minOccurs="0"/> + <xs:element name="accounts" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="account" type="tns:accountType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="courseTypes" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="courseType" type="tns:courseTypeType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="courses" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="course" type="tns:courseType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="workgroups" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="workgroup" type="tns:workgroupType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="categories" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="category" type="tns:categoryType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="relations" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="relation" type="tns:mappedRelationType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="roles" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="role" type="tns:roleType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="lecturesToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="accountsToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="lectureTypesToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accountType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="surname" type="xs:string"/> + <xs:element name="firstName" type="xs:string"/> + <xs:element name="emailAddress" type="xs:string"/> + <xs:element name="login" type="xs:string"/> + <xs:element name="password" type="xs:string"/> + <xs:element name="globalRole" type="xs:string" minOccurs="0"/> + <xs:element name="degree" type="xs:string" minOccurs="0"/> + <xs:element name="academicTitle" type="xs:string" minOccurs="0"/> + <xs:element name="gender" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedEntityType" abstract="true"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedObjectType" abstract="true"> + <xs:sequence> + <xs:element name="busId" type="xs:int"/> + <xs:element name="clientId" type="xs:string" minOccurs="0"/> + <xs:element name="operation" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="courseTypeType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:int"/> + <xs:element name="name" type="xs:string"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="longDescription" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="courseType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="dates" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="date" type="tns:dateType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="active" type="xs:string" minOccurs="0"/> + <xs:element name="abbreviation" type="xs:string" minOccurs="0"/> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="logicalNumber" type="xs:int"/> + <xs:element name="type" type="xs:string" minOccurs="0"/> + <xs:element name="title" type="xs:string"/> + <xs:element name="semesterId" type="xs:string"/> + <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="prerequisites" type="xs:string" minOccurs="0"/> + <xs:element name="necessaryAssignment" type="xs:string" minOccurs="0"/> + <xs:element name="languageISO" type="xs:string" minOccurs="0"/> + <xs:element name="languageFull" type="xs:string" minOccurs="0"/> + <xs:element name="hyperlink" type="xs:string" minOccurs="0"/> + <xs:element name="hyperlinkname" type="xs:string" minOccurs="0"/> + <xs:element name="note" type="xs:string" minOccurs="0"/> + <xs:element name="comment" type="xs:string" minOccurs="0"/> + <xs:element name="semesterAsInt" type="xs:short"/> + <xs:element name="semesterAbbr" type="xs:string" minOccurs="0"/> + <xs:element name="semesterFull" type="xs:string" minOccurs="0"/> + <xs:element name="semesterPeriodsPerWeek" type="xs:int"/> + <xs:element name="expectedRegistrations" type="xs:int"/> + <xs:element name="maximumRegistrations" type="xs:int"/> + <xs:element name="activityConfirmation" type="xs:string" minOccurs="0"/> + <xs:element name="literature" type="xs:string" minOccurs="0"/> + <xs:element name="startDate" type="xs:string" minOccurs="0"/> + <xs:element name="endDate" type="xs:string" minOccurs="0"/> + <xs:element name="superRoleBusId" type="xs:int"/> + <xs:element name="assignmentManagement" type="xs:string" minOccurs="0"/> + <xs:element name="leadingSystemForAssigments" type="xs:string" minOccurs="0"/> + <xs:element name="bookingType" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="dateType"> + <xs:sequence> + <xs:element name="dateId" type="xs:int"/> + <xs:element name="startdate" type="xs:string" minOccurs="0"/> + <xs:element name="enddate" type="xs:string" minOccurs="0"/> + <xs:element name="starttime" type="xs:string" minOccurs="0"/> + <xs:element name="endtime" type="xs:string" minOccurs="0"/> + <xs:element name="stct" type="xs:string" minOccurs="0"/> + <xs:element name="dayofweek" type="xs:string" minOccurs="0"/> + <xs:element name="rythm" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="workgroupType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="name" type="xs:string"/> + <xs:element name="room" type="xs:string" minOccurs="0"/> + <xs:element name="semesterId" type="xs:string"/> + <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="languageISO" type="xs:string" minOccurs="0"/> + <xs:element name="maximumRegistrations" type="xs:int"/> + <xs:element name="startDate" type="xs:string" minOccurs="0"/> + <xs:element name="endDate" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="categoryType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="name" type="xs:string"/> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="sort" type="xs:int"/> + <xs:element name="semesterId" type="xs:string"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedRelationType"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence> + <xs:element name="busParentId" type="xs:int"/> + <xs:element name="busChildId" type="xs:int"/> + <xs:element name="clientChildId" type="xs:string" minOccurs="0"/> + <xs:element name="clientParentId" type="xs:string" minOccurs="0"/> + <xs:element name="relationType" type="xs:string" minOccurs="0"/> + <xs:element name="childSort" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="roleType"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence> + <xs:element name="name" type="xs:string"/> + <xs:element name="clientAccountId" type="xs:string" minOccurs="0"/> + <xs:element name="clientObjectId" type="xs:string" minOccurs="0"/> + <xs:element name="busAccountId" type="xs:int"/> + <xs:element name="busObjectId" type="xs:int"/> + <xs:element name="roleStatus" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="resultType"> + <xs:sequence> + <xs:element name="clientId" type="xs:string"/> + <xs:element name="status" type="xs:string"/> + <xs:element name="reason" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:element name="synchronizationMessage" type="tns:synchronizationMessageType"/> +</xs:schema> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.bpel 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,51 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="ObjectProcessor" + targetNamespace="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:tns="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess"> + <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" location="ObjectProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" location="IdentityMapper/wsdl/IdentityMapperWS/IdentityMapper.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" location="LSFClientAdapter/XSLTTransform.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="IdentityMapper" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" partnerLinkType="tns:IdentityMapper" partnerRole="IdentityMapperPortTypeRole"/> + <partnerLink name="ClientAdapter" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" partnerLinkType="tns:ObjectProcessor" myRole="ObjectProcessorPortTypeRole"/> + </partnerLinks> + <variables> + <variable name="ToBusIdOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" messageType="tns:ToBusIdOperationResponse"/> + <variable name="ToBusIdOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" messageType="tns:ToBusIdOperationRequest"/> + <variable name="ProcessObjectOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessObjectOperationRequest"/> + </variables> + <sequence> + <receive name="receiveObject" createInstance="yes" partnerLink="ClientAdapter" operation="ProcessObjectOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" portType="tns:ObjectProcessorPortType" variable="ProcessObjectOperationIn"> + <sxt:trace> + <sxt:log level="fine" location="onStart"> + <from>'ObjectProcessor called!'</from> + </sxt:log> + </sxt:trace> + </receive> + <assign name="prepareResolveBusId"> + <copy> + <from variable="ProcessObjectOperationIn" part="clientInstanceId"/> + <to variable="ToBusIdOperationIn" part="clientInstanceId"/> + </copy> + <copy> + <from>$ProcessObjectOperationIn.objectMessage/courses/course[1]/clientId</from> + <to variable="ToBusIdOperationIn" part="clientObjectId"/> + </copy> + </assign> + <invoke name="resolveBusId" partnerLink="IdentityMapper" operation="ToBusIdOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" portType="tns:IdentityMapperPortType" inputVariable="ToBusIdOperationIn" outputVariable="ToBusIdOperationOut"> + <sxt:trace> + <sxt:log level="fine" location="onComplete"> + <from>concat('Resolved busId: ', $ToBusIdOperationOut.busId)</from> + </sxt:log> + </sxt:trace> + </invoke> + <empty name="updateCDMM"/> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/ObjectProcessor/src/ObjectProcessor.wsdl 2009-03-25 09:41:36 UTC (rev 110) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="ObjectProcessor" targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns="http://cse.campussource.de/schema/DataTypes" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"> + <types> + <xsd:schema targetNamespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor"> + <xsd:import namespace="http://cse.campussource.de/schema/DataTypes" schemaLocation="file:/home/pete/NetBeansProjects/CSE-IP/LSFClientAdapter/src/DataTypes.xsd"/> + </xsd:schema> + </types> + <message name="ProcessObjectOperationRequest"> + <part name="clientInstanceId" type="xsd:long"/> + <part name="objectMessage" type="ns:synchronizationMessageType"/> + </message> + <portType name="ObjectProcessorPortType"> + <operation name="ProcessObjectOperation"> + <input name="input1" message="tns:ProcessObjectOperationRequest"/> + </operation> + </portType> + <plnk:partnerLinkType name="ObjectProcessor"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="ObjectProcessorPortTypeRole" portType="tns:ObjectProcessorPortType"/> + </plnk:partnerLinkType> +</definitions> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-03-25 09:41:15
|
Revision: 109 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=109&view=rev Author: pkasprzak Date: 2009-03-25 09:40:57 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ObjectProcessor/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-03-25 09:39:46
|
Revision: 108 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=108&view=rev Author: pkasprzak Date: 2009-03-25 09:39:33 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/build.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/catalog.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.properties trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/retrieved/ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/retrieved/src/ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/DataTypes.xsd trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundTransformation.xsl trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/LSFClientAdapter.wsdl trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/XSLTTransform.wsdl trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/sync-full.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/sync-small.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/sync-test.xml trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/sync-test_output.xml Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/build.xml 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,70 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See commented blocks below for --> +<!-- some examples of how to customize the build. --> +<!-- (If you delete it and reopen the project it will be recreated.) --> +<project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <description>Builds, tests, and runs the project .</description> + <import file="nbproject/build-impl.xml"/> + <!-- + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: + + -pre-init called before initialization of project properties + -post-init called after initialization of project properties + -pre-compile called before javac compilation + -post-compile called after javac compilation + -pre-compile-single called before javac compilation of single file + -post-compile-single called after javac compilation of single file + -pre-dist called before jar building + -post-dist called after jar building + -post-clean called after cleaning build products + + Example of pluging an obfuscator after the compilation could look like + + <target name="post-compile"> + <obfuscate> + <fileset dir="${build.classes.dir}"/> + </obfuscate> + </target> + + For list of available properties check the imported + nbproject/build-impl.xml file. + + Other way how to customize the build is by overriding existing main targets. + The target of interest are: + + init-macrodef-javac defines macro for javac compilation + init-macrodef-debug defines macro for class debugging + do-dist jar archive building + run execution of project + javadoc-build javadoc generation + + Example of overriding the target for project execution could look like + + <target name="run" depends="<PROJNAME>-impl.jar"> + <exec dir="bin" executable="launcher.exe"> + <arg file="${dist.jar}"/> + </exec> + </target> + + Notice that overridden target depends on jar target and not only on + compile target as regular run target does. Again, for list of available + properties which you can use check the target you are overriding in + nbproject/build-impl.xml file. + --> + <target name="-check-netbeans-home"> + <condition property="no.netbeans.home"> + <not> + <isset property="netbeans.home"/> + </not> + </condition> + </target> + <target name="-init-caps" if="no.netbeans.home"> + <property file="${basedir}/nbproject/private/private.properties"/> + <property name="netbeans.home" value="${caps.netbeans.home}/platform9"/> + <property name="netbeans.user" value="${caps.netbeans.user}"/> + <property name="from.commandline" value="true"/> + </target> + <target name="-pre-init" depends="-check-netbeans-home,-init-caps"/> +</project> Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/catalog.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/catalog.xml 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/> + <system systemId="ObjectProcessor/ObjectProcessor.wsdl" uri="nb-uri:ObjectProcessor#src/ObjectProcessor.wsdl"/> +</catalog> Property changes on: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/build-impl.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/build-impl.xml 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,155 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *** GENERATED FROM project.xml - DO NOT EDIT *** + *** EDIT ../build.xml INSTEAD *** + + For the purpose of easier reading the script + is divided into following sections: + + - initialization + - dist + - cleanup +--> +<project name="LSFClientAdapter-impl" default="default" basedir=".."> + <target name="default" depends="dist_se" description="Build whole project."/> + <!-- + ====================== + INITIALIZATION SECTION + ====================== + --> + <target name="-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-init-private" depends="-pre-init"> + <property file="nbproject/private/private.properties"/> + </target> + <target name="-init-userdir" depends="-pre-init,-init-private"> + <property name="user.properties.file" location="${netbeans.user}/build.properties"/> + </target> + <target name="-init-user" depends="-pre-init,-init-private,-init-userdir"> + <property file="${user.properties.file}"/> + </target> + <target name="-init-project" depends="-pre-init,-init-private,-init-userdir,-init-user"> + <property file="nbproject/project.properties"/> + </target> + <target name="-do-init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project"> + <available file="${src.dir}/../retrieved" property="retrieved.exists"/> + </target> + <target name="-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-init-check" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + </target> + <target name="-init-taskdefs" if="from.commandline"> + <path id="ant.task.classpath"> + <pathelement location="${netbeans.home}/../ide10/modules/ext/resolver-1.2.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-apache-xml-resolver.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-project-ant.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-project-libraries.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-projectapi.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-projectuiapi.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-catalog.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-xam.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-schema-model.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-wsdl-model.jar"/> + <pathelement location="${netbeans.home}/../ide10/modules/org-netbeans-modules-xml-retriever.jar"/> + <pathelement location="${netbeans.home}/../platform9/core/core.jar"/> + <pathelement location="${netbeans.home}/../platform9/core/org-openide-filesystems.jar"/> + <pathelement location="${netbeans.home}/../platform9/lib/boot.jar"/> + <pathelement location="${netbeans.home}/../platform9/lib/org-openide-modules.jar"/> + <pathelement location="${netbeans.home}/../platform9/lib/org-openide-util.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-dialogs.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-loaders.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-nodes.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-openide-text.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-netbeans-modules-masterfs.jar"/> + <pathelement location="${netbeans.home}/../platform9/modules/org-netbeans-modules-queries.jar"/> + <pathelement location="${netbeans.home}/../soa2/ant/nblib/org-netbeans-modules-bpel-project.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-debugger-api.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-model.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-project.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-bpel-validation.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-soa-ui.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-soa-validation.jar"/> + <pathelement location="${netbeans.home}/../soa2/modules/org-netbeans-modules-compapp-projects-base.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/ext/jxpath/jxpath1.1.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-catalogsupport.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-search.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-wsdl-extensions.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-xpath.jar"/> + <pathelement location="${netbeans.home}/../xml2/modules/org-netbeans-modules-xml-xpath-ext.jar"/> + </path> + <taskdef name="validate-project" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliValidateBpelProjectTask"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="generate-catalog-xml" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliGenerateCatalogTask"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="generate-jbi-xml" classname="org.netbeans.modules.bpel.project.anttasks.cli.CliGenerateJbiDescriptorTask"> + <classpath refid="ant.task.classpath"/> + </taskdef> + </target> + <target name="init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-taskdefs"/> + <!-- + ===================== + DIST BUILDING SECTION + ===================== + --> + <target name="-pre-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-deps-jar-dist" depends="init" unless="${no.dependencies}"> + <ant target="dist_se" inheritall="false" dir="${project.ObjectProcessor}"/> + </target> + <target name="-do-dist" depends="init,-pre-dist"> + <mkdir dir="${build.dir}"/> + <!--validation--> + <validate-project buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" buildDependentProjectDir="${basedir}/${build.dir}/dependentProjectFiles" classpathRef="ant.task.classpath" allowBuildWithError="${allow.build.with.error}" validation="${validation}"/> + <!-- copy all files from project source directory to build directory. --> + <copy todir="${build.dir}" preservelastmodified="true"> + <fileset includes="**/*.bpel,**/*.wsdl,**/*.xsd, **/*.xsl, **/*.xslt, **/*.jar" dir="${src.dir}"/> + </copy> + <generate-catalog-xml buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" classpathRef="ant.task.classpath"/> + <generate-jbi-xml buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" classpathRef="ant.task.classpath"/> + <jar compress="${jar.compress}" jarfile="${build.dir}/SEDeployment.jar"> + <fileset includes="**/*.bpel,**/*.wsdl,**/*.xsd, **/*.xsl, **/*.xslt, **/*.jar" excludes="SEDeployment.jar" dir="${basedir}/${build.dir}"/> + <fileset dir="${basedir}/${build.dir}"> + <include name="**/jbi.xml"/> + <include name="**/catalog.xml"/> + </fileset> + </jar> + </target> + <target name="-post-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="dist_se" depends="init,-pre-dist,-deps-jar-dist,-do-dist,-post-dist" description="Build distribution."/> + <!-- + =============== + CLEANUP SECTION + =============== + --> + <target name="-pre-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-deps-clean" depends="init" unless="${no.dependencies}"> + <ant target="clean" inheritall="false" dir="${project.ObjectProcessor}"/> + </target> + <target name="-do-clean" depends="init,-pre-clean"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + </target> + <target name="-post-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="clean" depends="init,-pre-clean,-deps-clean,-do-clean,-post-clean" description="Clean build products."/> +</project> Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/genfiles.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/genfiles.properties 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,8 @@ +build.xml.data.CRC32=bd17bc39 +build.xml.script.CRC32=3d3dbc12 +build.xml.stylesheet.CRC32=1947459d +# 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=bd17bc39 +nbproject/build-impl.xml.script.CRC32=5594df24 +nbproject/build-impl.xml.stylesheet.CRC32=749ec361 Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.properties 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,30 @@ +allow.build.with.error=false +bcdeployment.jar=${build.dir}/BCDeployment.jar +build.classes.dir=${build.dir}/jar +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.generated.dir=${build.dir}/generated +com.sun.jbi.ui.devtool.jbi.description.application-sub-assembly=Represents this Service Unit +com.sun.jbi.ui.devtool.jbi.setype.prefix=sun-bpel-engine +debug.classpath=${javac.classpath}:${build.classes.dir} +dist.dir=dist +dist.jar=${dist.dir}/LSFClientAdapter.zip +dist.javadoc.dir=${dist.dir}/javadoc +jar.compress=false +jar.name=LSFClientAdapter.jar +javac.debug=true +javac.deprecation=false +javac.source=1.4 +javac.target=1.4 +jbi.se.type=sun-bpel-engine +jbi.service-unit.description=Represents this Service Unit +meta.inf=${source.root}/conf +platform.active=default_platform +project.ObjectProcessor=../ObjectProcessor +reference.ObjectProcessor.dist_se=${project.ObjectProcessor}/build/SEDeployment.jar +resource.dir=setup +sedeployment.jar=${build.dir}/SEDeployment.jar +source.encoding=UTF-8 +source.root=src +src.dir=${source.root} +wsdl.classpath= Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/nbproject/project.xml 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.bpel.project</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/j2ee-bpelpro/1"> + <name>LSFClientAdapter</name> + <minimum-ant-version>1.6</minimum-ant-version> + </data> + <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> + <reference> + <foreign-project>ObjectProcessor</foreign-project> + <artifact-type>jar</artifact-type> + <script>build.xml</script> + <target>dist_se</target> + <clean-target>clean</clean-target> + <id>dist_se</id> + </reference> + </references> + </configuration> +</project> Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/DataTypes.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/DataTypes.xsd (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/DataTypes.xsd 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,264 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://cse.campussource.de/schema/DataTypes" + xmlns:tns="http://cse.campussource.de/schema/DataTypes"> + + <xs:complexType name="synchronizationMessageType"> + <xs:sequence> + <xs:element name="isDebug" type="xs:boolean"/> + <xs:element name="isSyncMessage" type="xs:boolean"/> + <xs:element name="semesterName" type="xs:string" minOccurs="0"/> + <xs:element name="semesterLsfId" type="xs:string" minOccurs="0"/> + <xs:element name="rootCategoryId" type="xs:string" minOccurs="0"/> + <xs:element name="accounts" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="account" type="tns:accountType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="courseTypes" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="courseType" type="tns:courseTypeType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="courses" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="course" type="tns:courseType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="workgroups" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="workgroup" type="tns:workgroupType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="categories" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="category" type="tns:categoryType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="relations" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="relation" type="tns:mappedRelationType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="roles" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="role" type="tns:roleType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="lecturesToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="accountsToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="lectureTypesToDelete" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="lsfId" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="accountType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="surname" type="xs:string"/> + <xs:element name="firstName" type="xs:string"/> + <xs:element name="emailAddress" type="xs:string"/> + <xs:element name="login" type="xs:string"/> + <xs:element name="password" type="xs:string"/> + <xs:element name="globalRole" type="xs:string" minOccurs="0"/> + <xs:element name="degree" type="xs:string" minOccurs="0"/> + <xs:element name="academicTitle" type="xs:string" minOccurs="0"/> + <xs:element name="gender" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedEntityType" abstract="true"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence/> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedObjectType" abstract="true"> + <xs:sequence> + <xs:element name="busId" type="xs:int"/> + <xs:element name="clientId" type="xs:string" minOccurs="0"/> + <xs:element name="operation" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="courseTypeType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:int"/> + <xs:element name="name" type="xs:string"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="longDescription" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="courseType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="dates" minOccurs="0"> + <xs:complexType> + <xs:sequence> + <xs:element name="date" type="tns:dateType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="active" type="xs:string" minOccurs="0"/> + <xs:element name="abbreviation" type="xs:string" minOccurs="0"/> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="logicalNumber" type="xs:int"/> + <xs:element name="type" type="xs:string" minOccurs="0"/> + <xs:element name="title" type="xs:string"/> + <xs:element name="semesterId" type="xs:string"/> + <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="prerequisites" type="xs:string" minOccurs="0"/> + <xs:element name="necessaryAssignment" type="xs:string" minOccurs="0"/> + <xs:element name="languageISO" type="xs:string" minOccurs="0"/> + <xs:element name="languageFull" type="xs:string" minOccurs="0"/> + <xs:element name="hyperlink" type="xs:string" minOccurs="0"/> + <xs:element name="hyperlinkname" type="xs:string" minOccurs="0"/> + <xs:element name="note" type="xs:string" minOccurs="0"/> + <xs:element name="comment" type="xs:string" minOccurs="0"/> + <xs:element name="semesterAsInt" type="xs:short"/> + <xs:element name="semesterAbbr" type="xs:string" minOccurs="0"/> + <xs:element name="semesterFull" type="xs:string" minOccurs="0"/> + <xs:element name="semesterPeriodsPerWeek" type="xs:int"/> + <xs:element name="expectedRegistrations" type="xs:int"/> + <xs:element name="maximumRegistrations" type="xs:int"/> + <xs:element name="activityConfirmation" type="xs:string" minOccurs="0"/> + <xs:element name="literature" type="xs:string" minOccurs="0"/> + <xs:element name="startDate" type="xs:string" minOccurs="0"/> + <xs:element name="endDate" type="xs:string" minOccurs="0"/> + <xs:element name="superRoleBusId" type="xs:int"/> + <xs:element name="assignmentManagement" type="xs:string" minOccurs="0"/> + <xs:element name="leadingSystemForAssigments" type="xs:string" minOccurs="0"/> + <xs:element name="bookingType" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="dateType"> + <xs:sequence> + <xs:element name="dateId" type="xs:int"/> + <xs:element name="startdate" type="xs:string" minOccurs="0"/> + <xs:element name="enddate" type="xs:string" minOccurs="0"/> + <xs:element name="starttime" type="xs:string" minOccurs="0"/> + <xs:element name="endtime" type="xs:string" minOccurs="0"/> + <xs:element name="stct" type="xs:string" minOccurs="0"/> + <xs:element name="dayofweek" type="xs:string" minOccurs="0"/> + <xs:element name="rythm" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="workgroupType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="name" type="xs:string"/> + <xs:element name="room" type="xs:string" minOccurs="0"/> + <xs:element name="semesterId" type="xs:string"/> + <xs:element name="clientTitle" type="xs:string" minOccurs="0"/> + <xs:element name="shortDescription" type="xs:string" minOccurs="0"/> + <xs:element name="languageISO" type="xs:string" minOccurs="0"/> + <xs:element name="maximumRegistrations" type="xs:int"/> + <xs:element name="startDate" type="xs:string" minOccurs="0"/> + <xs:element name="endDate" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="categoryType"> + <xs:complexContent> + <xs:extension base="tns:mappedEntityType"> + <xs:sequence> + <xs:element name="name" type="xs:string"/> + <xs:element name="lsfId" type="xs:string"/> + <xs:element name="sort" type="xs:int"/> + <xs:element name="semesterId" type="xs:string"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="mappedRelationType"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence> + <xs:element name="busParentId" type="xs:int"/> + <xs:element name="busChildId" type="xs:int"/> + <xs:element name="clientChildId" type="xs:string" minOccurs="0"/> + <xs:element name="clientParentId" type="xs:string" minOccurs="0"/> + <xs:element name="relationType" type="xs:string" minOccurs="0"/> + <xs:element name="childSort" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:complexType name="roleType"> + <xs:complexContent> + <xs:extension base="tns:mappedObjectType"> + <xs:sequence> + <xs:element name="name" type="xs:string"/> + <xs:element name="clientAccountId" type="xs:string" minOccurs="0"/> + <xs:element name="clientObjectId" type="xs:string" minOccurs="0"/> + <xs:element name="busAccountId" type="xs:int"/> + <xs:element name="busObjectId" type="xs:int"/> + <xs:element name="roleStatus" type="xs:string" minOccurs="0"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + <xs:complexType name="resultType"> + <xs:sequence> + <xs:element name="clientId" type="xs:string"/> + <xs:element name="status" type="xs:string"/> + <xs:element name="reason" type="xs:string"/> + </xs:sequence> + </xs:complexType> + <xs:element name="synchronizationMessage" type="tns:synchronizationMessageType"/> +</xs:schema> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundClientAdapter.bpel 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8"?> +<process + name="InboundClientAdapter" + targetNamespace="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:sxt="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Trace" + xmlns:sxed="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Editor" + xmlns:sxat="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/Attachment" + xmlns:sxeh="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/ErrorHandling" + xmlns:dt="http://cse.campussource.de/schema/DataTypes" + xmlns:tns="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:ns0="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:sxxf="http://www.sun.com/wsbpel/2.0/process/executable/SUNExtension/XPathFunctions" xmlns:ns1="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor"> + + <import namespace="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" location="LSFClientAdapter.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://cse.campussource.de/schema/DataTypes" location="DataTypes.xsd" importType="http://www.w3.org/2001/XMLSchema"/> + <import namespace="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" location="XSLTTransform.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <import namespace="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" location="ObjectProcessor/ObjectProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/> + <partnerLinks> + <partnerLink name="XSLTTransform" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" partnerLinkType="tns:XSLTTransform" partnerRole="XSLTTransformPortTypeRole"/> + <partnerLink name="ObjectProcessor" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" partnerLinkType="tns:ObjectProcessor" partnerRole="ObjectProcessorPortTypeRole"/> + <partnerLink name="LSF" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" partnerLinkType="tns:LSFClientAdapter" myRole="LSFClientAdapterPortTypeRole"/> + </partnerLinks> + <variables> + <variable name="XSLTTransformOperationOut" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" messageType="tns:XSLTTransformOperationResponse"/> + <variable name="XSLTTransformOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" messageType="tns:XSLTTransformOperationRequest"/> + <variable name="ReceiveIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" messageType="tns:receiveRequest"/> + <variable name="synchronizationMessage" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" element="dt:synchronizationMessage"/> + </variables> + <sequence> + <receive name="receive" createInstance="yes" partnerLink="LSF" operation="receive" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" portType="tns:LSFClientAdapterPortType" variable="ReceiveIn"/> + <assign name="prepareXSLTTransform"> + <copy> + <from variable="ReceiveIn" part="InputData"/> + <to variable="XSLTTransformOperationIn" part="inputXML"/> + </copy> + </assign> + <invoke name="doXSLTTransform" partnerLink="XSLTTransform" operation="XSLTTransformOperation" xmlns:tns="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" portType="tns:XSLTTransformPortType" inputVariable="XSLTTransformOperationIn" outputVariable="XSLTTransformOperationOut"/> + <assign name="convertResult"> + <sxt:trace> + <sxt:log level="info" location="onStart"> + <ns0:from>concat('XSLT-Transofmation-Output: ', $XSLTTransformOperationOut.result)</ns0:from> + </sxt:log> + <sxt:log level="info" location="onComplete"> + <ns0:from>concat('Variable.SemesterName: ', $synchronizationMessage/semesterName)</ns0:from> + </sxt:log> + </sxt:trace> + <copy> + <from>sxxf:doUnMarshal($XSLTTransformOperationOut.result)</from> + <to variable="synchronizationMessage"/> + </copy> + </assign> + <empty name="XSLTTransformToGenericMessageModel"/> + <forEach name="ObjectSplitter" parallel="no" counterName="ObjectCounter"> + <sxt:trace> + <sxt:log level="fine" location="onStart"> + <ns0:from>'ForEach before start'</ns0:from> + </sxt:log> + </sxt:trace> + <startCounterValue>1</startCounterValue> + <finalCounterValue>count($synchronizationMessage/courses/course[.])</finalCounterValue> + <scope name="ObjectProcessor"> + <variables> + <variable name="ProcessObjectOperationIn" xmlns:tns="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" messageType="tns:ProcessObjectOperationRequest"/> + </variables> + <sequence name="Sequence1"> + <assign name="prepareProcessObject"> + <copy> + <from variable="synchronizationMessage"/> + <to variable="ProcessObjectOperationIn" part="objectMessage"/> + </copy> + </assign> + <assign name="setObject"> + <sxt:trace> + <sxt:log level="fine" location="onStart"> + <ns0:from variable="ObjectCounter"/> + </sxt:log> + </sxt:trace> +<!-- + <copy> + <from>$synchronizationMessage/courses/course[$ObjectCounter]</from> + <to>$ProcessObjectOperationIn.objectMessage/courses/course[1]</to> + </copy> +--> + <copy> + <from>1</from> + <to variable="ProcessObjectOperationIn" part="clientInstanceId"/> + </copy> + </assign> + <invoke name="processObject" partnerLink="ObjectProcessor" operation="ProcessObjectOperation" portType="ns1:ObjectProcessorPortType" inputVariable="ProcessObjectOperationIn"/> + </sequence> + </scope> + </forEach> + </sequence> +</process> Added: trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundTransformation.xsl =================================================================== --- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundTransformation.xsl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/src/InboundTransformation.xsl 2009-03-25 09:39:33 UTC (rev 108) @@ -0,0 +1,661 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://cse.campussource.de/schema/DataTypes"> + +<xsl:output method="xml" + media-type="text/xml" + indent="yes" + encoding="UTF-8" + omit-xml-declaration="no" +/> + +<!-- Leave empty to disable output of debug information --> +<xsl:variable name="DEBUG">1</xsl:variable> + +<!-- Lecture related (NOT workgroup related) roles get this prefix, so that they are distinguishable later on --> +<xsl:variable name="LECTURE_ROLE_PREFIX" select="'lecture:'"/> + +<!-- Relation types --> +<xsl:variable name="RELATION_TYPE_LECTURE_TO_WORKGROUPS" select="'lecture_to_workgroups'"/> +<xsl:variable name="RELATION_TYPE_LECTURETYPE_TO_LECTURES" select="'lecturetype_to_lectures'"/> +<xsl:variable name="RELATION_TYPE_CATEGORY_TO_CATEGORIES" select="'category_to_categories'"/> +<xsl:variable name="RELATION_TYPE_CATEGORY_TO_LECTURES" select="'category_to_lectures'"/> + +<!-- ################################################################################################################## --> + +<!-- [SYNCHRONIZATIONMESSAGE] --> + +<xsl:template match="/synchronizationMessage"> + + <xsl:element name="synchronizationMessage"> + + <xsl:copy-of select="isSyncMessage"/> + <xsl:copy-of select="isDebug"/> + + <xsl:element name="semesterName"> + <xsl:value-of select="semester/data/shortName"/> + </xsl:element> + + <xsl:element name="semesterLsfId"> + <xsl:value-of select="semester/data/lsfId"/> + </xsl:element> + + <xsl:element name="rootCategoryId"> + <xsl:if test="vvz/@rootKategorieId"> + <xsl:text>category:</xsl:text><xsl:value-of select="vvz/@rootKategorieId"/> + </xsl:if> + + </xsl:element> + + <!-- Generate "accounts" --> + + <!-- [ACCOUNTS] --> + + <!-- Create unified "accounts" by copying original "accounts" && merging "accounts2" --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating "accounts" (merging "accounts" and "accounts2") #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:element name="accounts"> + <xsl:for-each select="/synchronizationMessage/child::*[self::accounts or self::accounts2]/account"> + <xsl:element name="account"> + + <xsl:element name="clientId"> + <xsl:text>account:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + + <xsl:element name="globalRole"> + <xsl:choose> + <xsl:when test="name(..) = 'accounts2'"> + <xsl:text>User</xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:text>Tutor</xsl:text> + </xsl:otherwise> + </xsl:choose> + </xsl:element> + + <xsl:for-each select="./*"> + <xsl:copy-of select="."/> + <xsl:text> </xsl:text> + </xsl:for-each> + + </xsl:element> + </xsl:for-each> + </xsl:element> + + <!-- Generate lectureTypes --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating "lectureType" #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:element name="lectureTypes"> + <xsl:for-each select="/synchronizationMessage/lectureTypes/*"> + <xsl:element name="lectureType"> + + <xsl:element name="clientId"> + <xsl:text>lecturetype:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + + <xsl:for-each select="./*"> + <xsl:copy-of select="."/> + <xsl:text> </xsl:text> + </xsl:for-each> + + </xsl:element> + </xsl:for-each> + </xsl:element> + + <!-- Generate "lectures" --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating "lectures" #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:element name="lectures"> + <xsl:for-each select="/synchronizationMessage/lectures/*"> + <xsl:element name="lecture"> + + <!-- Copy everything except "groups", "accounts", "categories"-elements (these will be transformed to relations) --> + <xsl:for-each select="*"> + <xsl:if test="not(name() = 'groups') and not(name() = 'accounts') and not(name() = 'categories')"> + <xsl:copy-of select="."/> + <xsl:text> </xsl:text> + </xsl:if> + </xsl:for-each> + + <!-- Generate clientId --> + <xsl:element name="clientId"> + <xsl:text>lecture:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + + <!-- Generate semesterId --> + <xsl:element name="semesterId"> + <xsl:value-of select="/synchronizationMessage/semester/data/lsfId"/> + </xsl:element> + + <!-- Get start date from 'semester'-element --> + <xsl:element name="startDate"> + <xsl:value-of select="/synchronizationMessage/semester/data/lectureStart"/> + </xsl:element> + + <!-- Get end date from 'semester'-element --> + <xsl:element name="endDate"> + <xsl:value-of select="/synchronizationMessage/semester/data/lectureEnd"/> + </xsl:element> + + </xsl:element> + </xsl:for-each> + </xsl:element> + + <!-- Generate "workgroups" --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating "workgroups" #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:element name="workgroups"> + <xsl:for-each select="lectures/*"> + + <xsl:if test="$DEBUG"> + <xsl:comment>### Processing groups from (<xsl:value-of select="title"/>) ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="groups/group"> + <xsl:sort select="lsfId" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:call-template name="generate-workgroup"> + </xsl:call-template> + </xsl:if> + </xsl:for-each> + + </xsl:for-each> + </xsl:element> + + <!-- Generate "categories" --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating "categories" #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:element name="categories"> + <xsl:for-each select="/synchronizationMessage/vvz/*"> + <xsl:element name="category"> + + <!-- Generate clientId --> + <xsl:element name="clientId"> + <xsl:text>category:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + + <!-- Generate semesterId --> + <xsl:element name="semesterId"> + <xsl:value-of select="/synchronizationMessage/semester/data/lsfId"/> + </xsl:element> + + <!-- Copy everything except "children" and 'sort' --> + <xsl:for-each select="*"> + <xsl:if test="not(name() = 'children') and not(name() = 'sort')"> + <xsl:copy-of select="."/> + <xsl:text> </xsl:text> + </xsl:if> + </xsl:for-each> + + <!-- Check, if sort was set; if not, set it to MAX_INT --> + <xsl:choose> + <xsl:when test="normalize-space(sort)"> + <xsl:copy-of select="sort"/> + <xsl:text> </xsl:text> + </xsl:when> + <xsl:otherwise> + <xsl:comment>### Setting 'sort' to MAX_INT ###</xsl:comment><xsl:text> </xsl:text> + <xsl:element name="sort"> + <!-- Set to MAX_INT --> + <xsl:text>2147483647</xsl:text> + </xsl:element> + </xsl:otherwise> + </xsl:choose> + </xsl:element> + </xsl:for-each> + </xsl:element> + + <!-- Generate relations --> + + <xsl:element name="relations"> + + <!-- Generate lecture -> workgroup relations --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating lecture -> workgroup relations #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="lectures/*"> + + <xsl:if test="$DEBUG"> + <xsl:comment>### Processing lecture (<xsl:value-of select="title"/>) ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="groups/group"> + <xsl:sort select="lsfId" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:call-template name="generate-lectureToWorkgroupRelation"> + </xsl:call-template> + </xsl:if> + </xsl:for-each> + + </xsl:for-each> + + <!-- Generate category -> lecture relations --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating category -> lecture relations #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="lectures/*"> + + <xsl:if test="$DEBUG"> + <xsl:comment>### Processing lecture (<xsl:value-of select="title"/>) ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="categories/*"> + + <xsl:variable name="clientParentId"> + <xsl:text>category:</xsl:text> + <xsl:value-of select="lsfId"/> + </xsl:variable> + + <xsl:variable name="clientChildId"> + <xsl:text>lecture:</xsl:text> + <xsl:value-of select="../../lsfId"/> + </xsl:variable> + + <xsl:call-template name="generate-relation"> + <xsl:with-param name="type" select="$RELATION_TYPE_CATEGORY_TO_LECTURES"/> + <xsl:with-param name="clientChildId" select="$clientChildId"/> + <xsl:with-param name="clientParentId" select="$clientParentId"/> + <xsl:with-param name="sort" select="sort"/> + </xsl:call-template> + </xsl:for-each> + + </xsl:for-each> + + <!-- Generate lectureType -> lectures relations --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating lectureType -> lecture relations #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="lectures/*"> + + <xsl:if test="$DEBUG"> + <xsl:comment>### Processing lecture (<xsl:value-of select="title"/>) ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:variable name="clientChildId"> + <xsl:text>lecture:</xsl:text> + <xsl:value-of select="lsfId"/> + </xsl:variable> + + <xsl:variable name="clientParentId"> + <xsl:text>lecturetype:</xsl:text> + <xsl:value-of select="lectureTypeId"/> + </xsl:variable> + + <xsl:call-template name="generate-relation"> + <xsl:with-param name="type" select="$RELATION_TYPE_LECTURETYPE_TO_LECTURES"/> + <xsl:with-param name="clientChildId" select="$clientChildId"/> + <xsl:with-param name="clientParentId" select="$clientParentId"/> + </xsl:call-template> + + </xsl:for-each> + + <!-- Generate lectureType -> lectures relations --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating Category -> category relations #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="vvz/*"> + + <xsl:if test="$DEBUG"> + <xsl:comment>### Processing children of category (<xsl:value-of select="name"/>) ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="children/*"> + + <xsl:variable name="clientChildId"> + <xsl:text>category:</xsl:text> + <xsl:value-of select="."/> + </xsl:variable> + + <xsl:variable name="clientParentId"> + <xsl:text>category:</xsl:text> + <xsl:value-of select="../../lsfId"/> + </xsl:variable> + + <xsl:call-template name="generate-relation"> + <xsl:with-param name="type" select="$RELATION_TYPE_CATEGORY_TO_CATEGORIES"/> + <xsl:with-param name="clientChildId" select="$clientChildId"/> + <xsl:with-param name="clientParentId" select="$clientParentId"/> + </xsl:call-template> + + </xsl:for-each> + + </xsl:for-each> + + </xsl:element> + + <!-- Generate "roles" --> + + <xsl:if test="$DEBUG"> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:comment># Generating "roles" #</xsl:comment><xsl:text> </xsl:text> + <xsl:comment>##################################################################</xsl:comment><xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:element name="roles"> + <xsl:for-each select="lectures/*"> + + <xsl:if test="$DEBUG"> + <xsl:comment>### Processing roles defined in lecture (<xsl:value-of select="title"/>) ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <!-- Generate default roles from "accounts"-tag of "lecture" --> + <!-- (only if there are no groups) --> + + <xsl:if test="$DEBUG"> + <xsl:comment>### --> lecture roles ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:if test="count(groups/group) = 0"> + <xsl:for-each select="accounts/account"> + <xsl:call-template name="generate-role"> + <xsl:with-param name="name" select="concat($LECTURE_ROLE_PREFIX, roleName)"/> + <xsl:with-param name="clientObjectId" select="concat('lecture:', ../../lsfId)"/> + <xsl:with-param name="clientAccountId" select="concat('account:', lsfId)"/> + <xsl:with-param name="roleStatus" select="roleStatus"/> + </xsl:call-template> + </xsl:for-each> + </xsl:if> + + <!-- Generate roles from "groups"-tag of "lecture" --> + + <xsl:if test="$DEBUG"> + <xsl:comment>### --> group roles ###</xsl:comment> + <xsl:text> </xsl:text> + </xsl:if> + + <xsl:for-each select="groups/group"> + + <xsl:variable name="clientObjectId"> + <xsl:text>workgroup:</xsl:text><xsl:value-of select="../../lsfId"/> + <xsl:text>:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:variable> + + <xsl:for-each select="accounts/account"> + + <xsl:variable name="clientAccountId"> + <xsl:text>account:</xsl:text> + <xsl:value-of select="lsfId"/> + </xsl:variable> + + <xsl:call-template name="generate-role"> + <xsl:with-param name="name" select="roleName"/> + <xsl:with-param name="clientObjectId" select="$clientObjectId"/> + <xsl:with-param name="clientAccountId" select="$clientAccountId"/> + <xsl:with-param name="roleStatus" select="roleStatus"/> + </xsl:call-template> + + </xsl:for-each> + + </xsl:for-each> + + </xsl:for-each> + </xsl:element> + + <!-- Copy / adapt "lecturesToDelete" --> + + <xsl:element name="lecturesToDelete"> + <xsl:for-each select="lecturesToDelete/*"> + <xsl:element name="lsfId"> + <xsl:text>lecture:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + </xsl:for-each> + </xsl:element> + + <!-- Copy / adapt "accountsToDelete" --> + + <xsl:element name="accountsToDelete"> + <xsl:for-each select="accountsToDelete/*"> + <xsl:element name="lsfId"> + <xsl:text>account:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + </xsl:for-each> + </xsl:element> + + <!-- Copy / adapt "lectureTypesToDelete" --> + + <xsl:element name="lectureTypesToDelete"> + <xsl:for-each select="lectureTypesToDelete/*"> + <xsl:element name="lsfId"> + <xsl:text>lecturetype:</xsl:text><xsl:value-of select="lsfId"/> + </xsl:element> + </xsl:for-each> + </xsl:element> + + </xsl:element> + +</xsl:template> + +<!-- ################################################################################################################## --> + +<!-- [GENERATE WORKGROUP] --> + +<xsl:template name="generate-workgroup"> + + <xsl:variable name="currentLsfId" select="lsfId"/> + + <xsl:element name="workgroup"> + <xsl:copy-of select="lsfId|name|room"/> + + <!-- Generate clientId --> + <xsl:element name="clientId"> + <xsl:text>workgroup:</xsl:text><xsl:value-of select="../../lsfId"/>:<xsl:value-of select="lsfId"/> + </xsl:element> + + <!-- Generate semesterId --> + <xsl:element name="semesterId"> + <xsl:value-of select="/synchronizationMessage/semester/data/lsfId"/> + </xsl:element> + + <!-- Get start date from 'semester'-element --> + <xsl:element name="startDate"> + <xsl:value-of select="/synchronizationMessage/semester/data/lectureStart"/> + </xsl:element> + + <!-- Get end date from 'semester'-element --> + <xsl:element name="endDate"> + <xsl:value-of select="/synchronizationMessage/semester/data/lectureEnd"/> + </xsl:element> + + <xsl:text> </xsl:text> + </xsl:element> + + <xsl:for-each select="../child::group[number(child::lsfId) > number($currentLsfId)]"> + <xsl:sort select="lsfId" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:call-template name="generate-workgroup"> + </xsl:call-template> + </xsl:if> + </xsl:for-each> + +</xsl:template> + +<!-- ################################################################################################################## --> + +<!-- [GENERATE LECTURETOWORKGROUPRELATION] --> + +<xsl:template name="generate-lectureToWorkgroupRelation"> + + <xsl:variable name="workgroupLsfId" select="lsfId"/> + <xsl:variable name="lectureLsfId" select="../../lsfId"/> + + <xsl:variable name="clientChildId"> + <xsl:text>workgroup:</xsl:text> + <xsl:value-of select="$lectureLsfId"/><xsl:text>:</xsl:text><xsl:value-of select="$workgroupLsfId"/> + </xsl:variable> + + <xsl:variable name="clientParentId"> + <xsl:text>lecture:</xsl:text> + <xsl:value-of select="$lectureLsfId"/> + </xsl:variable> + + <xsl:element name="relation"> + + <xsl:element name="clientId"> + <xsl:text>relation:</xsl:text> + <xsl:value-of select="$clientParentId"/> + <xsl:text>:</xsl:text> + <xsl:value-of select="$clientChildId"/> + </xsl:element> + + <xsl:element name="relationType"> + <xsl:value-of select="$RELATION_TYPE_LECTURE_TO_WORKGROUPS"/> + </xsl:element> + + <xsl:element name="clientParentId"> + <xsl:value-of select="$clientParentId"/> + </xsl:element> + + <xsl:element name="clientChildId"> + <xsl:value-of select="$clientChildId"/> + </xsl:element> + + </xsl:element> + + <xsl:for-each select="../child::group[number(child::lsfId) > number($workgroupLsfId)]"> + <xsl:sort select="lsfId" data-type="number"/> + <xsl:if test="position() = 1"> + <xsl:call-template name="generate-lectureToWorkgroupRelation"> + </xsl:call-template> + </xsl:if> + </xsl:for-each> + +</xsl:template> + +<!-- ################################################################################################################## --> + +<xsl:template name="generate-relation"> + + <xsl:param name="type"/> + <xsl:param name="clientChildId"/> + <xsl:param name="clientParentId"/> + <xsl:param name="sort"/> + + <xsl:element name="relation"> + + <xsl:element name="clientId"> + <xsl:text>relation:</xsl:text> + <xsl:value-of select="$cli... [truncated message content] |
From: <pka...@us...> - 2009-03-25 09:39:03
|
Revision: 107 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=107&view=rev Author: pkasprzak Date: 2009-03-25 09:38:58 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/LSFClientAdapter/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-03-25 09:38:08
|
Revision: 106 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=106&view=rev Author: pkasprzak Date: 2009-03-25 09:37:57 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/IdentityMapper/build.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/catalog.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/libs/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/libs/commons-lang-2.4.jar trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/ant-deploy.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jax-ws.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jaxws-build.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.properties trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/MANIFEST.MF trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/persistence.xml trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/wsdl/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/wsdl/IdentityMapperWS/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/IdentityMapperWS/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/IdentityMapperWS/wsdl/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/IdentityMapperWS/wsdl/IdentityMapper.wsdl trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/IdentityMapper.wsdl trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/IdNotFoundException.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/IdentityMapper.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/IdentityMapperBean.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/IdentityMapperLocal.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/IdentityMapperWS.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/MappedClientObject.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/MappedClientObjectPK.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/java/de/campussource/cse/mapper/MapperException.java trunk/sandbox/lsf-adapter-demo/IdentityMapper/test/ Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/build.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See commented blocks below for --> +<!-- some examples of how to customize the build. --> +<!-- (If you delete it and reopen the project it will be recreated.) --> +<!-- By default, only the Clean and Build commands use this build script. --> +<!-- Commands such as Run, Debug, and Test only use this build script if --> +<!-- the Compile on Save feature is turned off for the project. --> +<!-- You can turn off the Compile on Save (or Deploy on Save) setting --> +<!-- in the project's Project Properties dialog box.--> +<project name="IdentityMapper" default="default" basedir="." xmlns:ejbjarproject="http://www.netbeans.org/ns/j2ee-ejbjarproject/3"> + <description>Builds, tests, and runs the project IdentityMapper.</description> + <import file="nbproject/build-impl.xml"/> + <!-- + + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: + + -pre-init: called before initialization of project properties + -post-init: called after initialization of project properties + -pre-compile: called before javac compilation + -post-compile: called after javac compilation + -pre-compile-single: called before javac compilation of single file + -post-compile-single: called after javac compilation of single file + -pre-dist: called before archive building + -post-dist: called after archive building + -post-clean: called after cleaning build products + -pre-run-deploy: called before deploying + -post-run-deploy: called after deploying + + (Targets beginning with '-' are not intended to be called on their own.) + + Example of pluging an obfuscator after the compilation could look like + + <target name="-post-compile"> + <obfuscate> + <fileset dir="${build.classes.dir}"/> + </obfuscate> + </target> + + For list of available properties check the imported + nbproject/build-impl.xml file. + + + Other way how to customize the build is by overriding existing main targets. + The target of interest are: + + init-macrodef-javac: defines macro for javac compilation + init-macrodef-debug: defines macro for class debugging + do-dist: archive building + run: execution of project + javadoc-build: javadoc generation + + Example of overriding the target for project execution could look like + + <target name="run" depends="<PROJNAME>-impl.jar"> + <exec dir="bin" executable="launcher.exe"> + <arg file="${dist.jar}"/> + </exec> + </target> + + Notice that overridden target depends on jar target and not only on + compile target as regular run target does. Again, for list of available + properties which you can use check the target you are overriding in + nbproject/build-impl.xml file. + + --> +</project> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/catalog.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/catalog.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/IdentityMapper/src/java/IdentityMapper.wsdl" uri="src/conf/xml-resources/web-services/IdentityMapperWS/wsdl/IdentityMapper.wsdl"/> +</catalog> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/libs/commons-lang-2.4.jar =================================================================== (Binary files differ) Property changes on: trunk/sandbox/lsf-adapter-demo/IdentityMapper/libs/commons-lang-2.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Property changes on: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/ant-deploy.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/ant-deploy.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/ant-deploy.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project default="-deploy-ant" basedir="."> + <target name="-init-cl-deployment-env" if="deploy.ant.enabled"> + <property file="${deploy.ant.properties.file}" /> + <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/> + <available file="${deploy.ant.resource.dir}" property="has.setup"/> + <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! --> + <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/> + </target> + + <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present"> + <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/> + <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/> + <!-- The doctype triggers resolution which can fail --> + <replace file="${temp.sun.web}"> + <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken> + <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue> + </replace> + <replace file="${temp.sun.web}"> + <replacetoken><![CDATA[<sun-web-app]]></replacetoken> + <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue> + </replace> + <xmlproperty file="${temp.sun.web}" validate="false"> + </xmlproperty> + <delete file="${temp.sun.web}"/> + <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/> + </target> + <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup"> + <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/> + <mkdir dir="${sjsas.resources.dir}"/> + <mkdir dir="${sjsas.resources.dir}/META-INF"/> + <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/> + <copy todir="${sjsas.resources.dir}/META-INF"> + <fileset dir="${deploy.ant.resource.dir}"/> + </copy> + <jar destfile="${deploy.ant.archive}" update="true"> + <fileset dir="${sjsas.resources.dir}"/> + </jar> + <delete dir="${sjsas.resources.dir}"/> + </target> + <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled"> + <echo message="Deploying ${deploy.ant.archive}"/> + <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask" + classpath="${sjsas.root}/lib/sun-appserv-ant.jar" /> + <sun-appserv-deploy user="${sjsas.username}" + passwordfile="${sjsas.password.file}" + host="${sjsas.host}" port="${sjsas.port}" + file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/> + <delete file="${sjsas.password.file}"/> + </target> + <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled"> + <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask" + classpath="${sjsas.root}/lib/sun-appserv-ant.jar" /> + <sun-appserv-undeploy user="${sjsas.username}" + passwordfile="${sjsas.password.file}" + host="${sjsas.host}" port="${sjsas.port}" + file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/> + <delete file="${sjsas.password.file}"/> + </target> +</project> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/build-impl.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/build-impl.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,577 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +*** GENERATED FROM project.xml - DO NOT EDIT *** +*** EDIT ../build.xml INSTEAD *** + +For the purpose of easier reading the script +is divided into following sections: + + - initialization + - compilation + - dist + - execution + - debugging + - javadoc + - cleanup + + --> +<project xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" basedir=".." default="default" name="IdentityMapper-impl"> + <import file="jaxws-build.xml"/> + <import file="ant-deploy.xml"/> + <target depends="dist,javadoc" description="Build whole project." name="default"/> + <!-- + INITIALIZATION SECTION + --> + <target name="-pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-pre-init" name="-init-private"> + <property file="nbproject/private/private.properties"/> + </target> + <target depends="-pre-init,-init-private" name="-init-userdir"> + <property location="${netbeans.user}/build.properties" name="user.properties.file"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir" name="-init-user"> + <property file="${user.properties.file}"/> + <!-- The two properties below are usually overridden --> + <!-- by the active platform. Just a fallback. --> + <property name="default.javac.source" value="1.4"/> + <property name="default.javac.target" value="1.4"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user" name="-init-project"> + <property file="nbproject/project.properties"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-init-macrodef-property" name="-do-init"> + <!-- Ensure configuration directory exists. --> + <mkdir dir="${meta.inf}"/> + <property name="runmain.jvmargs" value=""/> + <condition property="have.tests"> + <or> + <available file="${test.src.dir}"/> + </or> + </condition> + <condition property="have.sources"> + <or> + <available file="${src.dir}"/> + </or> + </condition> + <condition property="netbeans.home+have.tests"> + <and> + <isset property="netbeans.home"/> + <isset property="have.tests"/> + </and> + </condition> + <condition property="no.javadoc.preview"> + <isfalse value="${javadoc.preview}"/> + </condition> + <available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/> + <condition property="classes.dir" value="${build.ear.classes.dir}"> + <isset property="dist.ear.dir"/> + </condition> + <property name="classes.dir" value="${build.classes.dir}"/> + <condition property="no.deps"> + <and> + <istrue value="${no.dependencies}"/> + </and> + </condition> + <condition property="no.dist.ear.dir"> + <not> + <isset property="dist.ear.dir"/> + </not> + </condition> + <property name="source.encoding" value="${file.encoding}"/> + <condition property="javadoc.encoding.used" value="${javadoc.encoding}"> + <and> + <isset property="javadoc.encoding"/> + <not> + <equals arg1="${javadoc.encoding}" arg2=""/> + </not> + </and> + </condition> + <property name="javadoc.encoding.used" value="${source.encoding}"/> + <property name="includes" value="**"/> + <property name="excludes" value=""/> + <condition else="" property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'"> + <and> + <isset property="jaxws.endorsed.dir"/> + <available file="nbproject/jaxws-build.xml"/> + </and> + </condition> + </target> + <target depends="init" name="-init-cos" unless="deploy.on.save"> + <condition property="deploy.on.save" value="true"> + <istrue value="${j2ee.deploy.on.save}"/> + </condition> + </target> + <target name="-post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init" name="-init-check"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="test.src.dir">Must set test.src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="build.generated.dir">Must set build.generated.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="build.classes.dir">Must set build.classes.dir</fail> + <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail> + <fail unless="build.classes.excludes">Must set build.classes.excludes</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + <fail unless="j2ee.platform.classpath"> +The Java EE server classpath is not correctly set up. Your active server type is ${j2ee.server.type}. +Either open the project in the IDE and assign the server or setup the server classpath manually. +For example like this: + ant -Duser.properties.file=<path_to_property_file> (where you put the property "j2ee.platform.classpath" in a .properties file) +or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties file is used) + </fail> + </target> + <target name="-init-macrodef-property"> + <macrodef name="property" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute name="name"/> + <attribute name="value"/> + <sequential> + <property name="@{name}" value="${@{value}}"/> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-javac"> + <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2"> + <attribute default="${src.dir}" name="srcdir"/> + <attribute default="${build.classes.dir}" name="destdir"/> + <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="${javac.debug}" name="debug"/> + <element name="customize" optional="true"/> + <sequential> + <property name="javac.compilerargs" value=""/> + <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}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/> + <customize/> + </javac> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-junit"> + <macrodef name="junit" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2"> + <attribute default="${includes}" name="includes"/> + <attribute default="${excludes}" name="excludes"/> + <attribute default="**" name="testincludes"/> + <sequential> + <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true"> + <batchtest todir="${build.test.results.dir}"> + <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}"> + <filename name="@{testincludes}"/> + </fileset> + </batchtest> + <classpath> + <path path="${run.test.classpath}"/> + <path path="${j2ee.platform.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper from="test-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <formatter type="brief" usefile="false"/> + <formatter type="xml"/> + <jvmarg line="${runmain.jvmargs}"/> + </junit> + </sequential> + </macrodef> + </target> + <target name="-init-macrodef-java"> + <macrodef name="java" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/3"> + <attribute default="${main.class}" name="classname"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" fork="true"> + <jvmarg line="${runmain.jvmargs}"/> + <classpath> + <path path="${build.classes.dir}:${javac.classpath}:${j2ee.platform.classpath}"/> + </classpath> + <syspropertyset> + <propertyref prefix="run-sys-prop."/> + <mapper from="run-sys-prop.*" to="*" type="glob"/> + </syspropertyset> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target depends="-init-debug-args" name="-init-macrodef-nbjpda"> + <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute default="${main.class}" name="name"/> + <attribute default="${debug.classpath}" name="classpath"/> + <sequential> + <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}"> + <classpath> + <path path="@{classpath}"/> + </classpath> + </nbjpdastart> + </sequential> + </macrodef> + <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute default="${build.classes.dir}" name="dir"/> + <sequential> + <nbjpdareload> + <fileset dir="@{dir}" includes="${fix.classes}"> + <include name="${fix.includes}*.class"/> + </fileset> + </nbjpdareload> + </sequential> + </macrodef> + <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1"> + <sequential> + <nbjpdaappreloaded/> + </sequential> + </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> + <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}"> + <isset property="debug.transport"/> + </condition> + </target> + <target depends="-init-debug-args" name="-init-macrodef-debug"> + <macrodef name="debug" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <attribute default="${main.class}" name="classname"/> + <attribute default="${debug.classpath}" name="classpath"/> + <attribute default="${application.args}" name="args"/> + <element name="customize" optional="true"/> + <sequential> + <java classname="@{classname}" fork="true"> + <jvmarg line="${debug-args-line}"/> + <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/> + <classpath> + <path path="@{classpath}"/> + </classpath> + <arg line="@{args}"/> + <customize/> + </java> + </sequential> + </macrodef> + </target> + <target name="-init-taskdefs"> + <fail unless="libs.CopyLibs.classpath"> +The libs.CopyLibs.classpath property is not set up. +This property must point to +org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part +of NetBeans IDE installation and is usually located at +<netbeans_installation>/java<version>/ant/extra folder. +Either open the project in the IDE and make sure CopyLibs library +exists or setup the property manually. For example like this: + ant -Dlibs.CopyLibs.classpath=a/path/to/org-netbeans-modules-java-j2seproject-copylibstask.jar + </fail> + <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/> + </target> + <target depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-taskdefs" name="init"/> + <!-- + COMPILATION SECTION + --> + <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps"/> + <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps"/> + <target depends="init, -deps-module-jar, -deps-ear-jar" name="deps-jar"/> + <target depends="init,deps-jar,wsimport-service-generate" name="-pre-pre-compile"> + <mkdir dir="${build.classes.dir}"/> + <mkdir dir="${build.ear.classes.dir}"/> + </target> + <target name="-pre-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="compile" name="library-inclusion-in-archive"> + <copyfiles files="${file.reference.commons-lang-2.4.jar}" todir="${build.classes.dir}"/> + </target> + <target depends="compile" name="library-inclusion-in-manifest"> + <copyfiles files="${file.reference.commons-lang-2.4.jar}" manifestproperty="manifest.file.reference.commons-lang-2.4.jar" todir="${dist.ear.dir}"/> + <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"> + <attribute name="Class-Path" value="${manifest.file.reference.commons-lang-2.4.jar} "/> + </manifest> + </target> + <target name="-copy-meta-inf"> + <copy todir="${classes.dir}"> + <fileset dir="${meta.inf}" includes="**/*.dbschema"/> + </copy> + <copy todir="${classes.dir}/META-INF"> + <fileset dir="${meta.inf}" excludes="**/*.dbschema **/xml-resources/** ${meta.inf.excludes}"/> + </copy> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-copy-meta-inf,wsimport-service-compile" if="have.sources" name="-do-compile"> + <ejbjarproject2:javac destdir="${classes.dir}"/> + <copy todir="${classes.dir}"> + <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + </copy> + </target> + <target name="-post-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/> + <target name="-pre-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile,wsimport-service-compile" name="-do-compile-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <ejbjarproject2:javac excludes="" includes="${javac.includes}"/> + </target> + <target name="-post-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/> + <!-- + DIST BUILDING SECTION + --> + <target name="-pre-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-dist,library-inclusion-in-archive" if="has.custom.manifest" name="-do-dist-with-manifest"> + <dirname file="${dist.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.jar}" manifest="${build.classes.dir}/META-INF/MANIFEST.MF"> + <fileset dir="${build.classes.dir}"/> + </jar> + </target> + <target depends="init,compile,-pre-dist,library-inclusion-in-archive" name="-do-dist-without-manifest" unless="has.custom.manifest"> + <dirname file="${dist.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.jar}"> + <fileset dir="${build.classes.dir}"/> + </jar> + </target> + <target depends="init,compile,-pre-dist,library-inclusion-in-archive, -do-dist-without-manifest, -do-dist-with-manifest" name="-do-dist"/> + <target depends="init,compile,-pre-dist,library-inclusion-in-manifest" name="-do-ear-dist"> + <dirname file="${dist.ear.jar}" property="dist.jar.dir"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.ear.jar}" manifest="${build.ear.classes.dir}/META-INF/MANIFEST.MF"> + <fileset dir="${build.ear.classes.dir}"/> + </jar> + </target> + <target name="-post-dist"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-dist,-do-dist,-post-dist" description="Build distribution (JAR)." name="dist"/> + <target depends="init,-init-cos,compile,-pre-dist,-do-ear-dist,-post-dist" description="Build distribution (JAR) to be packaged into an EAR." name="dist-ear"/> + <!-- + EXECUTION SECTION + --> + <target depends="run-deploy" description="Deploy to server." name="run"/> + <target name="-init-deploy"> + <property name="include.jar.manifest" value=""/> + </target> + <target name="pre-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="post-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="-pre-nbmodule-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. --> + </target> + <target name="-post-nbmodule-run-deploy"> + <!-- Empty placeholder for easier customization. --> + <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. --> + </target> + <target name="-run-deploy-am"> + <!-- Task to deploy to the Access Manager runtime. --> + </target> + <target depends="init,-init-cos,-init-deploy,compile,library-inclusion-in-archive,dist,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy" name="run-deploy"> + <nbjpdaappreloaded/> + </target> + <target if="netbeans.home" name="-run-deploy-nb"> + <nbdeploy debugmode="false" forceRedeploy="${forceRedeploy}"/> + </target> + <target name="-init-deploy-ant" unless="netbeans.home"> + <property name="deploy.ant.archive" value="${dist.jar}"/> + <property name="deploy.ant.resource.dir" value="${resource.dir}"/> + <property name="deploy.ant.enabled" value="true"/> + </target> + <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/> + <target if="netbeans.home" name="-run-undeploy-nb"> + <fail message="Undeploy is not supported from within the IDE"/> + </target> + <target depends="dist" name="verify"> + <nbverify file="${dist.jar}"/> + </target> + <target depends="init,compile-single" name="run-main"> + <fail unless="run.class">Must select one file in the IDE or set run.class</fail> + <ejbjarproject3:java classname="${run.class}"/> + </target> + <!-- + DEBUGGING SECTION + --> + <target depends="init,compile,dist" description="Debug project in IDE." if="netbeans.home" name="debug"> + <nbdeploy debugmode="true"/> + <antcall target="connect-debugger"/> + </target> + <target name="connect-debugger" unless="is.debugged"> + <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}"> + <classpath> + <path path="${debug.classpath}"/> + </classpath> + <sourcepath> + <path path="${web.docbase.dir}"/> + </sourcepath> + </nbjpdaconnect> + </target> + <target depends="init" if="netbeans.home" name="-debug-start-debugger"> + <ejbjarproject1:nbjpdastart/> + </target> + <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single"> + <fail unless="main.class">Must select one file in the IDE or set main.class</fail> + <ejbjarproject1:debug/> + </target> + <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/> + <target depends="init" name="-pre-debug-fix"> + <fail unless="fix.includes">Must set fix.includes</fail> + <property name="javac.includes" value="${fix.includes}.java"/> + </target> + <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix"> + <ejbjarproject1:nbjpdareload/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/> + <!-- + JAVADOC SECTION + --> + <target depends="init" 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}"> + <classpath> + <path path="${javac.classpath}:${j2ee.platform.classpath}"/> + </classpath> + <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}"> + <filename name="**/*.java"/> + </fileset> + </javadoc> + </target> + <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview"> + <nbbrowse file="${dist.javadoc.dir}/index.html"/> + </target> + <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/> + <!-- + JUNIT COMPILATION SECTION + --> + <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test"> + <mkdir dir="${build.test.classes.dir}"/> + </target> + <target name="-pre-compile-test"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test"> + <ejbjarproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/> + <copy todir="${build.test.classes.dir}"> + <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/> + </copy> + </target> + <target name="-post-compile-test"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/> + <target name="-pre-compile-test-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + <ejbjarproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/> + </target> + <target name="-post-compile-test-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/> + <!-- + JUNIT EXECUTION SECTION + --> + <target depends="init" if="have.tests" name="-pre-test-run"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run"> + <ejbjarproject2:junit testincludes="**/*Test.java"/> + </target> + <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init" if="have.tests" name="test-report"/> + <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/> + <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/> + <target depends="init" if="have.tests" name="-pre-test-run-single"> + <mkdir dir="${build.test.results.dir}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single"> + <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail> + <ejbjarproject2:junit excludes="" includes="${test.includes}"/> + </target> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/> + <!-- + JUNIT DEBUGGING SECTION + --> + <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test"> + <fail unless="test.class">Must select one file in the IDE or set test.class</fail> + <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/> + <delete file="${test.report.file}"/> + <!-- the directory must exist, otherwise the XML formatter would fail --> + <mkdir dir="${build.test.results.dir}"/> + <ejbjarproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}"> + <customize> + <arg value="showoutput=true"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/> + <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/> + </customize> + </ejbjarproject1:debug> + </target> + <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test"> + <ejbjarproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/> + </target> + <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/> + <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test"> + <ejbjarproject1:nbjpdareload dir="${build.test.classes.dir}"/> + </target> + <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/> + <!-- + CLEANUP SECTION + --> + <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/> + <target depends="init" name="-do-clean"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + </target> + <target name="-post-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target depends="init" if="netbeans.home" name="undeploy-clean"> + <nbundeploy failOnError="false" startServer="false"/> + </target> + <target depends="init,undeploy-clean,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/> + <target depends="clean" name="clean-ear"/> +</project> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/genfiles.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/genfiles.properties 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,9 @@ +build.xml.data.CRC32=bcda26e5 +build.xml.script.CRC32=29df7b19 +build.xml.stylesheet.CRC32=e5f4c432 +# 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=bcda26e5 +nbproject/build-impl.xml.script.CRC32=89029a13 +nbproject/build-impl.xml.stylesheet.CRC32=36c39d59 +nbproject/jaxws-build.xml.stylesheet.CRC32=f49c6152 Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jax-ws.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jax-ws.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jax-ws.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1"> + <services> + <service name="IdentityMapperWS"> + <implementation-class>de.campussource.cse.mapper.IdentityMapperWS</implementation-class> + <wsdl-url>file:/home/pete/NetBeansProjects/CSE-IP/IdentityMapper/src/java/IdentityMapper.wsdl</wsdl-url> + <local-wsdl-file>IdentityMapper.wsdl</local-wsdl-file> + <service-name>IdentityMapperService</service-name> + <port-name>IdentityMapperPort</port-name> + <package-name>org.netbeans.j2ee.wsdl.identitymapper.identitymapper</package-name> + <catalog-file>catalog.xml</catalog-file> + <use-provider>false</use-provider> + <wsimport-options> + <wsimport-option> + <wsimport-option-name>extension</wsimport-option-name> + <wsimport-option-value>true</wsimport-option-value> + </wsimport-option> + <wsimport-option> + <wsimport-option-name>verbose</wsimport-option-name> + <wsimport-option-value>true</wsimport-option-value> + </wsimport-option> + <wsimport-option> + <wsimport-option-name>xnocompile</wsimport-option-name> + <wsimport-option-value>true</wsimport-option-value> + </wsimport-option> + </wsimport-options> + </service> + </services> + <clients/> +</jax-ws> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jaxws-build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jaxws-build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/jaxws-build.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns:xalan="http://xml.apache.org/xslt" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1"> + <!-- + =================== + JAX-WS WSGEN SECTION + =================== + --> + <!-- + =================== + JAX-WS WSIMPORT SECTION + =================== + --> + <target name="wsimport-init" depends="init"> + <mkdir dir="${build.generated.dir}/wsimport/service"/> + <mkdir dir="${build.generated.dir}/wsimport/binaries"/> + <mkdir dir="${classes.dir}"/> + <taskdef name="wsimport" classname="com.sun.tools.ws.ant.WsImport"> + <classpath path="${j2ee.platform.wsimport.classpath}"/> + </taskdef> + </target> + <target name="wsimport-service-check-IdentityMapperWS" depends="wsimport-init"> + <condition property="wsimport-service-IdentityMapperWS.notRequired"> + <available file="${build.generated.dir}/wsimport/service/org/netbeans/j2ee/wsdl/identitymapper/identitymapper/IdentityMapperService.java"/> + </condition> + </target> + <target name="wsimport-service-IdentityMapperWS" depends="wsimport-init,wsimport-service-check-IdentityMapperWS" unless="wsimport-service-IdentityMapperWS.notRequired"> + <property name="service-wsdl-IdentityMapperWS" location="${meta.inf}/xml-resources/web-services/IdentityMapperWS/wsdl/IdentityMapper.wsdl"/> + <wsimport sourcedestdir="${build.generated.dir}/wsimport/service" destdir="${build.generated.dir}/wsimport/binaries" wsdl="${service-wsdl-IdentityMapperWS}" catalog="catalog.xml" extension="true" verbose="true" xnocompile="true"/> + <property name="targetLocation-IdentityMapperWS" location="${meta.inf}/wsdl/IdentityMapperWS"/> + <property name="sourceLocation-IdentityMapperWS" location="${meta.inf}/xml-resources/web-services/IdentityMapperWS/wsdl/"/> + <copy todir="${targetLocation-IdentityMapperWS}"> + <fileset dir="${sourceLocation-IdentityMapperWS}"/> + </copy> + </target> + <target name="wsimport-service-clean-IdentityMapperWS" depends="-init-project"> + <delete dir="${build.generated.dir}/wsimport/service/org/netbeans/j2ee/wsdl/identitymapper/identitymapper"/> + </target> + <target name="wsimport-service-generate" depends="wsimport-service-IdentityMapperWS"/> + <target name="wsimport-service-compile" depends="wsimport-service-generate"> + <ejbjarproject2:javac srcdir="${build.generated.dir}/wsimport/service" classpath="${j2ee.platform.wsimport.classpath}:${javac.classpath}" destdir="${classes.dir}"/> + </target> +</project> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.properties 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,59 @@ +build.classes.dir=${build.dir}/jar +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.ear.classes.dir=${build.dir}/jar +build.generated.dir=${build.dir}/generated +build.test.classes.dir=${build.dir}/test/classes +build.test.results.dir=${build.dir}/test/results +debug.classpath=${javac.classpath}:${build.classes.dir} +debug.test.classpath=\ + ${run.test.classpath} +dist.dir=dist +dist.ear.jar=${dist.dir}/${jar.name} +dist.jar=${dist.dir}/${jar.name} +dist.javadoc.dir=${dist.dir}/javadoc +excludes= +file.reference.commons-lang-2.4.jar=libs/commons-lang-2.4.jar +includes=** +j2ee.deploy.on.save=true +j2ee.platform=1.5 +j2ee.server.type=J2EE +jar.compress=false +jar.name=IdentityMapper.jar +javac.classpath=\ + ${file.reference.commons-lang-2.4.jar} +javac.debug=true +javac.deprecation=false +javac.source=1.5 +javac.target=1.5 +javac.test.classpath=\ + ${javac.classpath}:\ + ${build.classes.dir}:\ + ${libs.junit.classpath}:\ + ${libs.junit_4.classpath} +javadoc.additionalparam= +javadoc.author=false +javadoc.encoding=${source.encoding} +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.preview=true +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +meta.inf=${source.root}/conf +meta.inf.excludes=sun-cmp-mappings.xml +platform.active=default_platform +resource.dir=setup +run.test.classpath=\ + ${javac.test.classpath}:\ + ${build.test.classes.dir} +# Space-separated list of JVM arguments used when running a class with a main method or a unit test +# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value): +runmain.jvmargs= +source.encoding=UTF-8 +source.root=src +src.dir=${source.root}/java +test.src.dir=test Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/nbproject/project.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.j2ee.ejbjarproject</type> + <configuration> + <buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1"> + <extension file="jaxws-build.xml" id="jaxws"> + <dependency dependsOn="wsimport-service-compile" target="-do-compile"/> + <dependency dependsOn="wsimport-service-compile" target="-do-compile-single"/> + <dependency dependsOn="wsimport-service-generate" target="-pre-pre-compile"/> + </extension> + </buildExtensions> + <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3"> + <name>IdentityMapper</name> + <minimum-ant-version>1.6.5</minimum-ant-version> + <included-library>file.reference.commons-lang-2.4.jar</included-library> + <source-roots> + <root id="src.dir"/> + </source-roots> + <test-roots> + <root id="test.src.dir"/> + </test-roots> + </data> + </configuration> +</project> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/MANIFEST.MF =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/MANIFEST.MF (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/MANIFEST.MF 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,2 @@ +Manifest-Version: 1.0 + Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/persistence.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/persistence.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/persistence.xml 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence version="1.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"> + <persistence-unit name="cs-idmapper" transaction-type="JTA"> + <provider>oracle.toplink.essentials.PersistenceProvider</provider> + <jta-data-source>jdbc/cseip</jta-data-source> + <exclude-unlisted-classes>false</exclude-unlisted-classes> + <properties> + </properties> + </persistence-unit> +</persistence> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="IdentityMapper" targetNamespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + <types/> + <message name="ToBusIdOperationRequest"> + <part name="clientInstanceId" type="xsd:long"/> + <part name="clientObjectId" type="xsd:string"/> + </message> + <message name="ToBusIdOperationResponse"> + <part name="busId" type="xsd:long"/> + </message> + <message name="IdentityMapperOperationRequest"> + <part name="busId" type="xsd:long"/> + <part name="clientInstanceId" type="xsd:long"/> + </message> + <message name="IdentityMapperOperationResponse"> + <part name="clientObjectId" type="xsd:string"/> + </message> + <message name="IdentityMapperOperationRequest1"> + <part name="busId" type="xsd:long"/> + <part name="clientInstanceId" type="xsd:long"/> + <part name="clientObjectId" type="xsd:string"/> + </message> + <portType name="IdentityMapperPortType"> + <operation name="ToBusIdOperation"> + <input name="input1" message="tns:ToBusIdOperationRequest"/> + <output name="output1" message="tns:ToBusIdOperationResponse"/> + </operation> + <operation name="ToClientObjectIdOperation"> + <input name="input2" message="tns:IdentityMapperOperationRequest"/> + <output name="output2" message="tns:IdentityMapperOperationResponse"/> + </operation> + <operation name="PersistClientObjectIdOperation"> + <input name="input3" message="tns:IdentityMapperOperationRequest1"/> + </operation> + </portType> + <binding name="IdentityMapperBinding" type="tns:IdentityMapperPortType"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="ToBusIdOperation"> + <soap:operation/> + <input name="input1"> + <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper"/> + </input> + <output name="output1"> + <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper"/> + </output> + </operation> + <operation name="ToClientObjectIdOperation"> + <soap:operation/> + <input name="input2"> + <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper"/> + </input> + <output name="output2"> + <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper"/> + </output> + </operation> + <operation name="PersistClientObjectIdOperation"> + <soap:operation/> + <input name="input3"> + <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper"/> + </input> + </operation> + </binding> + <service name="IdentityMapperService"> + <port name="IdentityMapperPort" binding="tns:IdentityMapperBinding"> + <soap:address location="http://localhost:${HttpDefaultPort}/IdentityMapperService/IdentityMapperPort"/> + </port> + </service> + <plnk:partnerLinkType name="IdentityMapper"> + <!-- A partner link type is automatically generated when a new port type is added. Partner link types are used by BPEL processes. +In a BPEL process, a partner link represents the interaction between the BPEL process and a partner service. Each partner link is associated with a partner link type. +A partner link type characterizes the conversational relationship between two services. The partner link type can have one or two roles.--> + <plnk:role name="IdentityMapperPortTypeRole" portType="tns:IdentityMapperPortType"/> + </plnk:partnerLinkType> +</definitions> Added: trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/IdentityMapperWS/wsdl/IdentityMapper.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/IdentityMapperWS/wsdl/IdentityMapper.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/IdentityMapper/src/conf/xml-resources/web-services/IdentityMapperWS/wsdl/IdentityMapper.wsdl 2009-03-25 09:37:57 UTC (rev 106) @@ -0,0 +1,77 @@ +<?xml version="1.0" encoding="UTF-8"?> +<definitions name="IdentityMapper" targetNamespace="http://j2ee.netbeans.or... [truncated message content] |
From: <pka...@us...> - 2009-03-25 09:37:09
|
Revision: 105 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=105&view=rev Author: pkasprzak Date: 2009-03-25 09:37:00 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/IdentityMapper/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <pka...@us...> - 2009-03-25 09:35:52
|
Revision: 104 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=104&view=rev Author: pkasprzak Date: 2009-03-25 09:35:41 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/CSEIPCA/Catalog.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/build.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/catalog.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/AssemblyInformation.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/BindingComponentInformation.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/ComponentInformation.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/connections.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/java-cfg-IdentityMapper.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/java-cfg-XSLTTransform.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/javaee_config.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/jbiasa/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/jbiasa/CSEIPCA.wsdl trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/TestCase1/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/TestCase1/Concurrent.properties trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/TestCase1/Input.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/TestCase1/Output.xml trunk/sandbox/lsf-adapter-demo/CSEIPCA/test/selected-tests.properties Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/Catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/Catalog.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/Catalog.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?><catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"><nextCatalog catalog="src/jbiServiceUnits/META-INF/LSFClientAdapter/catalog.xml"/><nextCatalog catalog="src/jbiServiceUnits/META-INF/ObjectProcessor/catalog.xml"/></catalog> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/build.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/build.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- You may freely edit this file. See commented blocks below for --> +<!-- some examples of how to customize the build. --> +<!-- (If you delete it and reopen the project it will be recreated.) --> +<project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> + <description>Builds, tests, and runs the project .</description> + <import file="nbproject/build-impl.xml"/> + <!-- + + There exist several targets which are by default empty and which can be + used for execution of your tasks. These targets are usually executed + before and after some main targets. They are: + + pre-init: called before initialization of project properties + post-init: called after initialization of project properties + pre-compile: called before javac compilation + post-compile: called after javac compilation + pre-compile-single: called before javac compilation of single file + post-compile-single: called after javac compilation of single file + pre-dist: called before jar building + post-dist: called after jar building + post-clean: called after cleaning build products + + Example of pluging an obfuscator after the compilation could look like + + <target name="post-compile"> + <obfuscate> + <fileset dir="${build.classes.dir}"/> + </obfuscate> + </target> + + For list of available properties check the imported + nbproject/build-impl.xml file. + + + Other way how to customize the build is by overriding existing main targets. + The target of interest are: + + init-macrodef-javac: defines macro for javac compilation + init-macrodef-debug: defines macro for class debugging + do-dist: jar archive building + run: execution of project + javadoc-build: javadoc generation + + Example of overriding the target for project execution could look like + + <target name="run" depends="<PROJNAME>-impl.jar"> + <exec dir="bin" executable="launcher.exe"> + <arg file="${dist.jar}"/> + </exec> + </target> + + Notice that overridden target depends on jar target and not only on + compile target as regular run target does. Again, for list of available + properties which you can use check the target you are overriding in + nbproject/build-impl.xml file. + + --> + <target name="-check-netbeans-home"> + <condition property="no.netbeans.home"> + <not> + <isset property="netbeans.home"/> + </not> + </condition> + </target> + <target name="-init-caps" if="no.netbeans.home"> + <property file="${basedir}/nbproject/private/private.properties"/> + <property name="netbeans.home" value="${caps.netbeans.home}/platform9"/> + <property name="netbeans.user" value="${caps.netbeans.user}"/> + <property name="from.commandline" value="true"/> + </target> + <target name="-check-catd-context"> + <condition property="no.catd.context"> + <not> + <isset property="org.netbeans.modules.compapp.catd.context"/> + </not> + </condition> + </target> + <target name="-init-catd" if="no.catd.context"> + <property name="org.netbeans.modules.compapp.catd.context" value=""/> + </target> + <target name="pre-init" depends="-check-netbeans-home,-init-caps,-check-catd-context,-init-catd"/> +</project> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/catalog.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/catalog.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> + <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/> +</catalog> \ No newline at end of file Property changes on: trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject ___________________________________________________________________ Added: svn:ignore + private Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/build-impl.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/build-impl.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,408 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + *** GENERATED FROM project.xml - DO NOT EDIT *** + *** EDIT ../build.xml INSTEAD *** + + For the purpose of easier reading the script + is divided into following sections: + + - initialization + - compilation + - dist + - execution + - debugging + - cleanup + + --> +<project name="CSEIPCA-jbi-impl" default="build" basedir=".."> + <target name="default" depends="dist" description="Build whole project."/> + <!-- + INITIALIZATION SECTION + --> + <target name="pre-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="init-private" depends="pre-init"> + <property file="nbproject/private/private.properties"/> + </target> + <target name="init-userdir" depends="pre-init,init-private"> + <property name="user.properties.file" location="${netbeans.user}/build.properties"/> + </target> + <target name="init-user" depends="pre-init,init-private,init-userdir"> + <property file="${user.properties.file}"/> + </target> + <target name="init-project" depends="pre-init,init-private,init-userdir,init-user"> + <property file="nbproject/project.properties"/> + </target> + <target name="do-init" depends="pre-init,init-private,init-userdir,init-user,init-project"> + <!-- The two properties below are usually overridden --> + <!-- by the active platform. Just a fallback. --> + <property name="default.javac.source" value="1.4"/> + <property name="default.javac.target" value="1.4"/> + <condition property="have.tests"> + <or> + <available file="${test.dir}"/> + </or> + </condition> + <condition property="netbeans.home+have.tests"> + <and> + <isset property="netbeans.home"/> + <isset property="have.tests"/> + </and> + </condition> + </target> + <target name="post-init"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="init-check" depends="pre-init,init-private,init-userdir,init-user,init-project,do-init"> + <fail unless="src.dir">Must set src.dir</fail> + <fail unless="build.dir">Must set build.dir</fail> + <fail unless="build.generated.dir">Must set build.generated.dir</fail> + <fail unless="dist.dir">Must set dist.dir</fail> + <fail unless="build.classes.dir">Must set build.classes.dir</fail> + <fail unless="dist.jar">Must set dist.jar</fail> + <fail unless="test.dir">Must set test.dir</fail> + </target> + <target name="-init-taskdefs" if="from.commandline"> + <path id="ant.task.classpath"> + <pathelement location="${soa.module.install.dir}/org-netbeans-modules-compapp-projects-jbi.jar"/> + <pathelement location="${soa.module.install.dir}/org-netbeans-modules-compapp-manager-jbi.jar"/> + <pathelement location="${soa.module.install.dir}/org-netbeans-soa-libs-xmlbeans.jar"/> + <pathelement location="${soa.module.install.dir}/ext/jbi/jbi-admin-common.jar"/> + <pathelement location="${soa.module.install.dir}/../ant/nblib/org-netbeans-modules-compapp-projects-jbi.jar"/> + <pathelement location="${netbeans.home}/lib/org-openide-util.jar"/> + <pathelement location="${netbeans.home}/lib/org-openide-modules.jar"/> + <pathelement location="${netbeans.home}/modules/org-openide-options.jar"/> + <pathelement location="${netbeans.home}/modules/org-openide-text.jar"/> + <pathelement location="${netbeans.home}/modules/org-openide-loaders.jar"/> + <pathelement location="${netbeans.home}/modules/org-openide-nodes.jar"/> + <pathelement location="${netbeans.home}/modules/org-openide-dialogs.jar"/> + <pathelement location="${netbeans.home}/core/org-openide-filesystems.jar"/> + <pathelement location="${ide.module.install.dir}/ext/xerces-2.8.0.jar"/> + <pathelement location="${ide.module.install.dir}/ext/xml-commons-dom-ranges-1.0.b2.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-retriever.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-schema-model.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-wsdl-model.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-xam.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-xml-text.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-editor.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-editor-lib.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-editor-util.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-projectapi.jar"/> + <pathelement location="${ide.module.install.dir}/org-netbeans-modules-classfile.jar"/> + <pathelement location="${ide.module.install.dir}/org-apache-xml-resolver.jar"/> + <pathelement location="${xml.module.install.dir}/org-netbeans-modules-xml-wsdl-extensions.jar"/> + <pathelement location="${ide.module.install.dir}/ext/jaxb/api/jaxb-api.jar"/> + <pathelement location="${ide.module.install.dir}/ext/jaxb/jaxb-impl.jar"/> + <pathelement location="${ide.module.install.dir}/ext/jaxb/activation.jar"/> + <pathelement location="${enterprise.module.install.dir}/org-netbeans-modules-j2eeserver.jar"/> + <pathelement location="${enterprise.module.install.dir}/ext/jsr88javax.jar"/> + </path> + <taskdef name="jbi-build-service-assembly" classname="org.netbeans.modules.compapp.projects.jbi.anttasks.BuildServiceAssembly"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="jbi-deploy-service-assembly" classname="org.netbeans.modules.compapp.projects.jbi.anttasks.DeployServiceAssembly"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="setup-debug-environment" classname="org.netbeans.modules.compapp.projects.jbi.anttasks.SetUpDebugEnvironment"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="teardown-debug-environment" classname="org.netbeans.modules.compapp.projects.jbi.anttasks.TearDownDebugEnvironment"> + <classpath refid="ant.task.classpath"/> + </taskdef> + <taskdef name="jbi-javaee-dist" classname="org.netbeans.modules.compapp.projects.jbi.anttasks.BuildJavaEESU"> + <classpath refid="ant.task.classpath"/> + </taskdef> + </target> + <target name="init" depends="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,-init-taskdefs"/> + <!-- + COMPILATION SECTION + --> + <target name="deps-jar" depends="init" unless="${no.dependencies}"> + <ant target="dist_se" inheritall="false" antfile="${project.LSFClientAdapter}/build.xml"/> + <property name="LSFClientAdapter.su.name" value="LSFClientAdapter"/> + <unzip src="${reference.LSFClientAdapter.dist_se}" dest="${src.dir}/../jbiServiceUnits/${LSFClientAdapter.su.name}"> + <patternset> + <include name="**/*.wsdl"/> + <include name="**/*.WSDL"/> + <include name="**/*.xsd"/> + <include name="**/*.XSD"/> + <include name="META-INF/jbi.xml"/> + <include name="META-INF/catalog.xml"/> + </patternset> + </unzip> + <property name="LSFClientAdapter.su.dir" value="${src.dir}/../jbiServiceUnits/${LSFClientAdapter.su.name}"/> + <move file="${LSFClientAdapter.su.dir}/META-INF/jbi.xml" todir="${LSFClientAdapter.su.dir}"/> + <move todir="${src.dir}/../jbiServiceUnits/META-INF/${LSFClientAdapter.su.name}"> + <fileset dir="${LSFClientAdapter.su.dir}/META-INF"/> + </move> + <ant target="dist_se" inheritall="false" antfile="${project.ObjectProcessor}/build.xml"/> + <property name="ObjectProcessor.su.name" value="ObjectProcessor"/> + <unzip src="${reference.ObjectProcessor.dist_se}" dest="${src.dir}/../jbiServiceUnits/${ObjectProcessor.su.name}"> + <patternset> + <include name="**/*.wsdl"/> + <include name="**/*.WSDL"/> + <include name="**/*.xsd"/> + <include name="**/*.XSD"/> + <include name="META-INF/jbi.xml"/> + <include name="META-INF/catalog.xml"/> + </patternset> + </unzip> + <property name="ObjectProcessor.su.dir" value="${src.dir}/../jbiServiceUnits/${ObjectProcessor.su.name}"/> + <move file="${ObjectProcessor.su.dir}/META-INF/jbi.xml" todir="${ObjectProcessor.su.dir}"/> + <move todir="${src.dir}/../jbiServiceUnits/META-INF/${ObjectProcessor.su.name}"> + <fileset dir="${ObjectProcessor.su.dir}/META-INF"/> + </move> + </target> + <target name="deps-javaee-jar" depends="init" unless="${no.dependencies}"> + <ant target="dist" inheritall="false" antfile="${project.IdentityMapper}/build.xml"/> + <basename property="IdentityMapper.su.name" file="${project.IdentityMapper}"/> + <property name="IdentityMapper.su.dir" value="${src.dir}/../jbiServiceUnits/${IdentityMapper.su.name}"/> + <unzip src="${reference.IdentityMapper.dist}" dest="${src.dir}/../jbiServiceUnits/${IdentityMapper.su.name}"> + <patternset> + <include name="**/*.wsdl"/> + <include name="**/*.WSDL"/> + <include name="**/*.xsd"/> + <include name="**/*.XSD"/> + <include name="META-INF/jbi.xml"/> + </patternset> + </unzip> + <unzip src="${reference.IdentityMapper.dist}" dest="${src.dir}/../jbiServiceUnits/META-INF/IdentityMapper"> + <patternset> + <include name="META-INF/catalog.xml"/> + </patternset> + </unzip> + <jbi-javaee-dist projectName="IdentityMapper" subprojJar="${reference.IdentityMapper.dist}" subprojDir="${project.IdentityMapper}" suExtractDir="${IdentityMapper.su.dir}" subprojResource="${resource.IdentityMapper}"/> + <ant target="dist" inheritall="false" antfile="${project.XSLTTransform}/build.xml"/> + <basename property="XSLTTransform.su.name" file="${project.XSLTTransform}"/> + <property name="XSLTTransform.su.dir" value="${src.dir}/../jbiServiceUnits/${XSLTTransform.su.name}"/> + <unzip src="${reference.XSLTTransform.dist}" dest="${src.dir}/../jbiServiceUnits/${XSLTTransform.su.name}"> + <patternset> + <include name="**/*.wsdl"/> + <include name="**/*.WSDL"/> + <include name="**/*.xsd"/> + <include name="**/*.XSD"/> + <include name="META-INF/jbi.xml"/> + </patternset> + </unzip> + <unzip src="${reference.XSLTTransform.dist}" dest="${src.dir}/../jbiServiceUnits/META-INF/XSLTTransform"> + <patternset> + <include name="META-INF/catalog.xml"/> + </patternset> + </unzip> + <jbi-javaee-dist projectName="XSLTTransform" subprojJar="${reference.XSLTTransform.dist}" subprojDir="${project.XSLTTransform}" suExtractDir="${XSLTTransform.su.dir}" subprojResource="${resource.XSLTTransform}"/> + </target> + <target name="pre-pre-compile" depends="init,deps-jar"> + <mkdir dir="${build.classes.dir}"/> + </target> + <target name="pre-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="library-inclusion-in-archive" depends="compile"> + <unjar dest="${build.classes.dir}" src="${reference.IdentityMapper.dist}"/> + <unjar dest="${build.classes.dir}" src="${reference.XSLTTransform.dist}"/> + </target> + <target name="library-inclusion-in-manifest" depends="compile"> + <basename property="included.lib.reference.IdentityMapper.dist" file="${reference.IdentityMapper.dist}"/> + <copy todir="${build.classes.dir}" file="${reference.IdentityMapper.dist}"/> + <basename property="included.lib.reference.XSLTTransform.dist" file="${reference.XSLTTransform.dist}"/> + <copy todir="${build.classes.dir}" file="${reference.XSLTTransform.dist}"/> + <manifest file="${build.classes.dir}/META-INF/MANIFEST.MF" mode="update"> + <attribute name="Class-Path" value="${included.lib.reference.IdentityMapper.dist},${included.lib.reference.XSLTTransform.dist}"/> + </manifest> + </target> + <target name="do-compile" depends="init,deps-jar,pre-pre-compile,pre-compile"/> + <target name="post-compile"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="compile" depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project."/> + <target name="pre-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="do-compile-single" depends="init,deps-jar,pre-pre-compile"> + <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail> + </target> + <target name="post-compile-single"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="compile-single" depends="init,deps-jar,pre-pre-compile,pre-compile-single,do-compile-single,post-compile-single"/> + <!-- + DIST BUILDING SECTION + --> + <target name="jbi-build" depends="init,init-deploy,deps-jar, deps-javaee-jar" description="Build Service Assembly."> + <mkdir dir="${src.dir}"/> + <copy todir="${src.dir}/../jbiServiceUnits" overwrite="true"> + <fileset dir="${src.dir}"/> + </copy> + <mkdir dir="${build.dir}/META-INF"/> + <jar compress="true" jarfile="${build.dir}/BCDeployment.jar"> + <fileset dir="${src.dir}/../jbiServiceUnits"> + <exclude name="**/catalog.xml"/> + <exclude name="**/jbi.xml"/> + </fileset> + </jar> + <jbi-build-service-assembly/> + <delete file="${build.dir}/BCDeployment.jar"/> + <dirname property="dist.jar.dir" file="${dist.jar}"/> + <mkdir dir="${dist.jar.dir}"/> + <jar compress="${jar.compress}" jarfile="${dist.jar}" filesetmanifest="merge"> + <fileset dir="${build.dir}" excludes="jar/*"/> + </jar> + </target> + <target name="jbi-clean-build" depends="init,init-deploy,clean,jbi-build" description="Clean and Build Service Assembly."/> + <target name="dist" depends="jbi-build" description="Build distribution (JAR)."/> + <!-- + EXECUTION SECTION + --> + <target name="run" depends="jbi-build,run-jbi-deploy" description="Deploy to server."/> + <target name="init-deploy"> + <property name="include.jar.manifest" value=""/> + </target> + <target name="run-jbi-deploy" depends="jbi-build"> + <property name="j2ee.server.instance" value=""/> + <loadproperties srcFile="${basedir}/nbproject/private/private.properties"/> + <jbi-deploy-service-assembly serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}"/> + </target> + <target name="undeploy" depends="init"> + <property name="j2ee.server.instance" value=""/> + <loadproperties srcFile="${basedir}/nbproject/private/private.properties"/> + <jbi-deploy-service-assembly undeployServiceAssembly="true" serviceAssemblyID="${jbi.service-assembly.id}" serviceAssemblyLocation="${basedir}/${dist.jar}" netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}"/> + </target> + <target name="-pre-debug"> + <property name="inDebug" value="true"/> + <setup-debug-environment netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}"/> + </target> + <target name="-post-debug"> + <property name="inDebug" value="false"/> + <teardown-debug-environment netBeansUserDir="${netbeans.user}" j2eeServerInstance="${j2ee.server.instance}"/> + </target> + <!-- + DEBUGGING SECTION + --> + <target name="debug" description="Debug project in IDE." depends="run,-pre-debug" if="netbeans.home"/> + <target name="pre-debug-fix" depends="init"> + <fail unless="fix.includes">Must set fix.includes</fail> + <property name="javac.includes" value="${fix.includes}.java"/> + </target> + <target name="do-debug-fix" if="netbeans.home" depends="init,pre-debug-fix,compile-single"> + <j2seproject:nbjpdareload xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1"/> + </target> + <target name="debug-fix" if="netbeans.home" depends="init,pre-debug-fix,do-debug-fix"/> + <!-- + CLEANUP SECTION + --> + <target name="deps-clean" depends="init" unless="${no.dependencies}"> + <ant target="clean" inheritall="false" antfile="${project.IdentityMapper}/build.xml"/> + <ant target="clean" inheritall="false" antfile="${project.LSFClientAdapter}/build.xml"/> + <ant target="clean" inheritall="false" antfile="${project.ObjectProcessor}/build.xml"/> + <ant target="clean" inheritall="false" antfile="${project.XSLTTransform}/build.xml"/> + </target> + <target name="do-clean" depends="init"> + <delete dir="${build.dir}"/> + <delete dir="${dist.dir}"/> + <delete dir="${source.root}/jbiServiceUnits"/> + </target> + <target name="post-clean"> + <!-- Empty placeholder for easier customization. --> + <!-- You can override this target in the ../build.xml file. --> + </target> + <target name="clean" depends="init,deps-clean,do-clean,post-clean" description="Clean build products."/> + <target name="jbi-clean-config" depends="init,clear-casa,jbi-clean-build" description="Clean service assembly."/> + <target name="clear-casa"> + <delete file="${source.root}/conf/${jbi.service-assembly.id}.casa"/> + <delete file="${src.dir}/${jbi.service-assembly.id}.wsdl"/> + </target> + <!-- + JUNIT EXECUTION SECTION + ======================= + --> + <target name="-pre-test-run" if="have.tests" depends="init"> + <mkdir dir="${test.results.dir}"/> + <path id="unit.test.classpath"> + <pathelement path="${soa.module.install.dir}/org-netbeans-modules-compapp-manager-jbi.jar"/> + <pathelement path="${soa.module.install.dir}/org-netbeans-modules-compapp-projects-jbi.jar"/> + <pathelement path="${soa.module.install.dir}/ext/jbi/jbi-admin-common.jar"/> + <pathelement path="${soa.module.install.dir}/ext/jbi/catd.jar"/> + <pathelement path="${java.module.install.dir}/ext/junit-3.8.2.jar"/> + <pathelement path="${java.module.install.dir}/ext/jaxws21/api/saaj-api.jar"/> + <pathelement path="${java.module.install.dir}/ext/jaxws21/saaj-impl.jar"/> + <pathelement path="${java.module.install.dir}/ext/jaxws21/FastInfoset.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-lib.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-util.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-lib2.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-indent.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-plain.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-plain-lib.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-settings.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-editor-settings-storage.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-lexer.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-core.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-lexer.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-text.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-xdm.jar"/> + <pathelement path="${ide.module.install.dir}/org-netbeans-modules-xml-xam.jar"/> + <pathelement path="${ide.module.install.dir}/ext/jaxb/activation.jar"/> + <pathelement path="${netbeans.home}/lib/org-openide-modules.jar"/> + <pathelement path="${netbeans.home}/lib/org-openide-util.jar"/> + <pathelement path="${netbeans.home}/modules/org-openide-options.jar"/> + <pathelement path="${netbeans.home}/modules/org-openide-text.jar"/> + <pathelement path="${netbeans.home}/modules/org-openide-loaders.jar"/> + <pathelement path="${netbeans.home}/modules/org-openide-nodes.jar"/> + <pathelement path="${netbeans.home}/modules/org-netbeans-modules-editor-mimelookup.jar"/> + <pathelement path="${netbeans.home}/modules/org-netbeans-modules-editor-mimelookup-impl.jar"/> + <pathelement path="${netbeans.home}/core/org-openide-filesystems.jar"/> + </path> + </target> + <target name="-do-test-run" if="netbeans.home+have.tests" depends="init,-pre-test-run"> + <junit showoutput="true" fork="yes" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed"> + <classpath refid="unit.test.classpath"/> + <sysproperty key="NetBeansUserDir" value="${netbeans.user}"/> + <sysproperty key="org.netbeans.modules.compapp.catd.context" value="${org.netbeans.modules.compapp.catd.context}"/> + <test name="org.netbeans.modules.compapp.catd.ConfiguredTest" haltonfailure="no" todir="${test.results.dir}"/> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper to="*" from="test-sys-prop.*" type="glob"/> + </syspropertyset> + <formatter usefile="false" type="brief"/> + <formatter type="xml"/> + </junit> + </target> + <target name="-do-single-test-run" if="netbeans.home+have.tests" depends="init,-pre-test-run"> + <junit showoutput="true" fork="yes" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed"> + <classpath refid="unit.test.classpath"/> + <sysproperty key="NetBeansUserDir" value="${netbeans.user}"/> + <sysproperty key="inDebug" value="${inDebug}"/> + <sysproperty key="org.netbeans.modules.compapp.catd.context" value="${org.netbeans.modules.compapp.catd.context}"/> + <test name="org.netbeans.modules.compapp.catd.ConfiguredTest" haltonfailure="no" todir="${test.results.dir}"/> + <syspropertyset> + <propertyref prefix="test-sys-prop."/> + <mapper to="*" from="test-sys-prop.*" type="glob"/> + </syspropertyset> + <formatter usefile="false" type="brief"/> + <formatter type="xml"/> + </junit> + </target> + <target name="-post-test-run" if="have.tests" depends="init,-pre-test-run,-do-test-run"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target name="-post-single-test-run" if="have.tests" depends="init,-pre-test-run,-do-single-test-run"> + <fail if="tests.failed">Some tests failed; see details above.</fail> + </target> + <target name="test-report" if="have.tests" depends="init"/> + <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/> + <target name="test" depends="init,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/> + <target name="test-single" depends="init,-pre-test-run,-do-single-test-run,test-report,-post-single-test-run,-test-browse" description="Run unit tests."/> + <target name="debug-single" depends="init,-pre-test-run,-pre-debug,-do-single-test-run,-post-debug,test-report,-post-single-test-run,-test-browse" description="Debug unit tests."/> + <target name="-post-unit-test-run" if="have.tests+tests.failed" depends="init,-pre-test-run,-do-test-run"> + <echo>Some tests failed; see details above.</echo> + </target> + <target name="unit-test" depends="init,-pre-test-run,-do-test-run,test-report,-post-unit-test-run,-test-browse" description="Run unit tests in a batch."/> + <target name="jbi-unit-test" depends="run,unit-test,undeploy" description="build, deploy, test, and undeploy."/> +</project> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/genfiles.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/genfiles.properties 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,8 @@ +build.xml.data.CRC32=0adf3efd +build.xml.script.CRC32=7a0b0a73 +build.xml.stylesheet.CRC32=c1dfe9a8 +# 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=0adf3efd +nbproject/build-impl.xml.script.CRC32=e6f05c5d +nbproject/build-impl.xml.stylesheet.CRC32=b6a25443 Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.properties (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.properties 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,55 @@ +build.classes.dir=${build.dir}/jar +build.classes.excludes=**/*.java,**/*.form,**/.nbattrs +build.dir=build +build.generated.dir=${build.dir}/generated +com.sun.jbi.routing=true +com.sun.jbi.routing.bc.autoconnect=true +com.sun.jbi.sa.internal.routing=true +debug.classpath=${javac.classpath}:${build.classes.dir} +dist.dir=dist +dist.jar=${dist.dir}/CSEIPCA.zip +dist.javadoc.dir=${dist.dir}/javadoc +j2ee.platform=1.4 +j2ee.server.type=J2EE +jar.compress=false +javac.debug=true +javac.deprecation=false +javac.source=1.4 +javac.target=1.4 +javadoc.author=false +javadoc.encoding= +javadoc.noindex=false +javadoc.nonavbar=false +javadoc.notree=false +javadoc.preview=true +javadoc.private=false +javadoc.splitindex=true +javadoc.use=true +javadoc.version=false +javadoc.windowtitle= +jbi.content.additional=${reference.ObjectProcessor.dist_se};${reference.IdentityMapper.dist};${reference.XSLTTransform.dist};${reference.LSFClientAdapter.dist_se} +jbi.content.component=sun-bpel-engine;sun-javaee-engine;sun-javaee-engine;sun-bpel-engine +jbi.content.javaee.jars=${reference.IdentityMapper.dist};${reference.XSLTTransform.dist} +jbi.service-assembly.description=Represents the Service Assembly of CSEIPCA +jbi.service-assembly.id=CSEIPCA +jbi.service-unit.description=Represents this Service Unit +meta.inf=${source.root}/conf +platform.active=default_platform +project.IdentityMapper=../IdentityMapper +project.LSFClientAdapter=../LSFClientAdapter +project.ObjectProcessor=../ObjectProcessor +project.XSLTTransform=../XSLTTransform +reference.IdentityMapper.dist=${project.IdentityMapper}/dist/IdentityMapper.jar +reference.LSFClientAdapter.dist_se=${project.LSFClientAdapter}/build/SEDeployment.jar +reference.ObjectProcessor.dist_se=${project.ObjectProcessor}/build/SEDeployment.jar +reference.XSLTTransform.dist=${project.XSLTTransform}/dist/XSLTTransform.jar +resource.IdentityMapper=${project.IdentityMapper}/setup +resource.LSFClientAdapter=${project.LSFClientAdapter}/setup +resource.ObjectProcessor=${project.ObjectProcessor}/setup +resource.XSLTTransform=${project.XSLTTransform}/setup +source.encoding=UTF-8 +source.root=src +src.build.dir=${source.root}/jbiServiceUnits +src.dir=${source.root}/jbiasa +test.dir=test +test.results.dir=${basedir}/test/results Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/nbproject/project.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.compapp.projects.jbi</type> + <configuration> + <data xmlns="http://www.netbeans.org/ns/j2ee-jbi/1"> + <name>CSEIPCA</name> + <minimum-ant-version>1.6</minimum-ant-version> + <included-library>reference.IdentityMapper.dist</included-library> + <included-library>reference.XSLTTransform.dist</included-library> + </data> + <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"> + <reference> + <foreign-project>IdentityMapper</foreign-project> + <artifact-type>j2ee_archive</artifact-type> + <script>build.xml</script> + <target>dist</target> + <clean-target>clean</clean-target> + <id>dist</id> + </reference> + <reference> + <foreign-project>LSFClientAdapter</foreign-project> + <artifact-type>CAPS.asa:sun-bpel-engine</artifact-type> + <script>build.xml</script> + <target>dist_se</target> + <clean-target>clean</clean-target> + <id>dist_se</id> + </reference> + <reference> + <foreign-project>ObjectProcessor</foreign-project> + <artifact-type>CAPS.asa:sun-bpel-engine</artifact-type> + <script>build.xml</script> + <target>dist_se</target> + <clean-target>clean</clean-target> + <id>dist_se</id> + </reference> + <reference> + <foreign-project>XSLTTransform</foreign-project> + <artifact-type>j2ee_archive</artifact-type> + <script>build.xml</script> + <target>dist</target> + <clean-target>clean</clean-target> + <id>dist</id> + </reference> + </references> + </configuration> +</project> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/AssemblyInformation.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/AssemblyInformation.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/AssemblyInformation.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<jbi xmlns="http://java.sun.com/xml/ns/jbi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd"> + <service-assembly> + <identification> + <name>CSEIPCA</name> + <description>Represents the Service Assembly of CSEIPCA</description> + </identification> + <service-unit> + <identification> + <name>CSEIPCA-ObjectProcessor</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>ObjectProcessor.jar</artifacts-zip> + <component-name>sun-bpel-engine</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-IdentityMapper</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>IdentityMapper.jar</artifacts-zip> + <component-name>sun-javaee-engine</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-XSLTTransform</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>XSLTTransform.jar</artifacts-zip> + <component-name>sun-javaee-engine</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-LSFClientAdapter</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>LSFClientAdapter.jar</artifacts-zip> + <component-name>sun-bpel-engine</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-database-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-database-binding.jar</artifacts-zip> + <component-name>sun-database-binding</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-file-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-file-binding.jar</artifacts-zip> + <component-name>sun-file-binding</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-ftp-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-ftp-binding.jar</artifacts-zip> + <component-name>sun-ftp-binding</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-http-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-http-binding.jar</artifacts-zip> + <component-name>sun-http-binding</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-jms-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-jms-binding.jar</artifacts-zip> + <component-name>sun-jms-binding</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-ldap-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-ldap-binding.jar</artifacts-zip> + <component-name>sun-ldap-binding</component-name> + </target> + </service-unit> + <service-unit> + <identification> + <name>CSEIPCA-sun-scheduler-binding</name> + <description>Represents this Service Unit</description> + </identification> + <target> + <artifacts-zip>sun-scheduler-binding.jar</artifacts-zip> + <component-name>sun-scheduler-binding</component-name> + </target> + </service-unit> + </service-assembly> +</jbi> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/BindingComponentInformation.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/BindingComponentInformation.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/BindingComponentInformation.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component-info-list> + <component-info> + <description>Database binding</description> + <name>sun-database-binding</name> + <state>Installed</state> + <type>binding</type> + <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/jdbc/</xmlns> + </component-info> + <component-info> + <description>File Binding</description> + <name>sun-file-binding</name> + <state>Installed</state> + <type>binding</type> + <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/file/</xmlns> + </component-info> + <component-info> + <description>FTP Binding</description> + <name>sun-ftp-binding</name> + <state>Installed</state> + <type>binding</type> + <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/ftp/</xmlns> + </component-info> + <component-info> + <description>HTTP Soap Binding to send SOAP messages e.g. to and from BPEL service engine.</description> + <name>sun-http-binding</name> + <state>Installed</state> + <type>binding</type> + <xmlns>http://schemas.xmlsoap.org/wsdl/http/</xmlns> + <xmlns>http://schemas.xmlsoap.org/wsdl/soap/</xmlns> + <xmlns>http://schemas.xmlsoap.org/wsdl/soap12/</xmlns> + </component-info> + <component-info> + <description>JMS Binding</description> + <name>sun-jms-binding</name> + <state>Installed</state> + <type>binding</type> + <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/jms/</xmlns> + </component-info> + <component-info> + <description>LDAP binding</description> + <name>sun-ldap-binding</name> + <state>Installed</state> + <type>binding</type> + <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/ldap/</xmlns> + </component-info> + <component-info> + <description>Scheduler Binding</description> + <name>sun-scheduler-binding</name> + <state>Installed</state> + <type>Binding</type> + <xmlns>http://schemas.sun.com/jbi/wsdl-extensions/scheduler/</xmlns> + </component-info> +</component-info-list> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/CSEIPCA.casa 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,98 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<casa xmlns="http://java.sun.com/xml/ns/casa" xmlns:ns1="LSFClientAdapterCA" xmlns:ns2="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/LSFClientAdapter" xmlns:ns3="http://j2ee.netbeans.org/wsdl/LSFClientAdapter/XSLTTransform" xmlns:ns4="http://j2ee.netbeans.org/wsdl/IdentityMapper/IdentityMapper" xmlns:ns5="http://enterprise.netbeans.org/bpel/ObjectProcessor/newProcess" xmlns:ns6="http://j2ee.netbeans.org/wsdl/ObjectProcessor/ObjectProcessor" xmlns:ns7="http://enterprise.netbeans.org/bpel/LSFClientAdapter/InboundClientAdapter" xmlns:xlink="http://www.w3.org/2000/xlink"> + <endpoints> + <endpoint endpoint-name="casaPort1" interface-name="ns2:LSFClientAdapterPortType" name="endpoint1" service-name="ns1:casaService1"/> + <endpoint endpoint-name="XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint2" service-name="ns3:XSLTTransformService"/> + <endpoint endpoint-name="IdentityMapperPort" interface-name="ns4:IdentityMapperPortType" name="endpoint3" service-name="ns4:IdentityMapperService"/> + <endpoint display-name="ClientAdapter" endpoint-name="ObjectProcessorPortTypeRole_myRole" file-path="ObjectProcessor.bpel" interface-name="ns6:ObjectProcessorPortType" name="endpoint4" process-name="ObjectProcessor" service-name="ns5:ClientAdapter"/> + <endpoint display-name="IdentityMapper" endpoint-name="IdentityMapperPortTypeRole_partnerRole" file-path="ObjectProcessor.bpel" interface-name="ns4:IdentityMapperPortType" name="endpoint5" process-name="ObjectProcessor" service-name="ns5:IdentityMapper"/> + <endpoint endpoint-name="javaee_IdentityMapperPort" interface-name="ns4:IdentityMapperPortType" name="endpoint6" service-name="ns4:IdentityMapperService"/> + <endpoint endpoint-name="javaee_XSLTTransformPort" interface-name="ns3:XSLTTransformPortType" name="endpoint7" service-name="ns3:XSLTTransformService"/> + <endpoint display-name="LSF" endpoint-name="LSFClientAdapterPortTypeRole_myRole" file-path="InboundClientAdapter.bpel" interface-name="ns2:LSFClientAdapterPortType" name="endpoint8" process-name="InboundClientAdapter" service-name="ns7:LSF"/> + <endpoint display-name="XSLTTransform" endpoint-name="XSLTTransformPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns3:XSLTTransformPortType" name="endpoint9" process-name="InboundClientAdapter" service-name="ns7:XSLTTransform"/> + <endpoint display-name="ObjectProcessor" endpoint-name="ObjectProcessorPortTypeRole_partnerRole" file-path="InboundClientAdapter.bpel" interface-name="ns6:ObjectProcessorPortType" name="endpoint10" process-name="InboundClientAdapter" service-name="ns7:ObjectProcessor"/> + </endpoints> + <service-units> + <service-engine-service-unit artifacts-zip="ObjectProcessor.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-ObjectProcessor" unit-name="ObjectProcessor" unknown="false" x="150" y="358"> + <provides endpoint="endpoint4"/> + <consumes endpoint="endpoint5"/> + </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="IdentityMapper.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-IdentityMapper" unit-name="IdentityMapper" unknown="false" x="152" y="511"> + <provides endpoint="endpoint6"/> + </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="XSLTTransform.jar" component-name="sun-javaee-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-XSLTTransform" unit-name="XSLTTransform" unknown="false" x="154" y="259"> + <provides endpoint="endpoint7"/> + </service-engine-service-unit> + <service-engine-service-unit artifacts-zip="LSFClientAdapter.jar" component-name="sun-bpel-engine" defined="true" description="Represents this Service Unit" internal="true" name="CSEIPCA-LSFClientAdapter" unit-name="LSFClientAdapter" unknown="false" x="143" y="72"> + <provides endpoint="endpoint8"/> + <consumes endpoint="endpoint9"/> + <consumes endpoint="endpoint10"/> + </service-engine-service-unit> + <binding-component-service-unit artifacts-zip="sun-http-binding.jar" component-name="sun-http-binding" description="Represents this Service Unit" name="CSEIPCA-sun-http-binding" unit-name="sun-http-binding"> + <ports> + <port bindingType="soap" x="67" y="116"> + <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/service[@name='casaService1']/port[@name='casaPort1'])" xlink:type="simple"/> + <consumes endpoint="endpoint1"/> + <provides endpoint="endpoint1"/> + </port> + <port state="deleted" x="67" y="37"> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService']/port[@name='XSLTTransformPort'])" xlink:type="simple"/> + <consumes endpoint="endpoint2"/> + <provides endpoint="endpoint2"/> + </port> + <port state="deleted" x="67" y="37"> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService']/port[@name='IdentityMapperPort'])" xlink:type="simple"/> + <consumes endpoint="endpoint3"/> + <provides endpoint="endpoint3"/> + </port> + </ports> + </binding-component-service-unit> + </service-units> + <connections> + <connection consumer="endpoint5" provider="endpoint6" state="unchanged"/> + <connection consumer="endpoint9" provider="endpoint7" state="unchanged"/> + <connection consumer="endpoint1" provider="endpoint8" state="new"/> + <connection consumer="endpoint10" provider="endpoint4" state="unchanged"/> + <connection consumer="endpoint2" provider="endpoint7" state="deleted"/> + <connection consumer="endpoint3" provider="endpoint6" state="deleted"/> + </connections> + <porttypes> + <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/portType[@name='dummyCasaPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/LSFClientAdapter.wsdl#xpointer(/definitions/portType[@name='LSFClientAdapterPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/ObjectProcessor/ObjectProcessor.wsdl#xpointer(/definitions/portType[@name='ObjectProcessorPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/LSFClientAdapter/src/_references/_projects/ObjectProcessor/src/ObjectProcessor.wsdl#xpointer(/definitions/portType[@name='ObjectProcessorPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/LSFClientAdapter/src/XSLTTransform.wsdl#xpointer(/definitions/portType[@name='XSLTTransformPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/portType[@name='dummyCasaPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/portType[@name='IdentityMapperPortType'])" xlink:type="simple"/> + </porttypes> + <bindings> + <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/binding[@name='casaBinding1'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/LSFClientAdapter.wsdl#xpointer(/definitions/binding[@name='LSFClientAdapterPortTypeBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/LSFClientAdapter/src/XSLTTransform.wsdl#xpointer(/definitions/binding[@name='XSLTTransformBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/binding[@name='casaBinding1'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/binding[@name='IdentityMapperBinding'])" xlink:type="simple"/> + </bindings> + <services> + <link xlink:href="../jbiasa/CSEIPCA.wsdl#xpointer(/definitions/service[@name='casaService1'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/LSFClientAdapter/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/XSLTTransform/META-INF/wsdl/XSLTTransform/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/LSFClientAdapter/src/XSLTTransform.wsdl#xpointer(/definitions/service[@name='XSLTTransformService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/META-INF/ObjectProcessor/src/_references/_projects/IdentityMapper/src/conf/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/CSEIPCA.wsdl#xpointer(/definitions/service[@name='casaService1'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/IdentityMapper/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> + <link xlink:href="../jbiServiceUnits/IdentityMapper/META-INF/wsdl/IdentityMapperWS/IdentityMapper.wsdl#xpointer(/definitions/service[@name='IdentityMapperService'])" xlink:type="simple"/> + </services> + <regions> + <region name="WSDL Endpoints" width="150"/> + <region name="JBI Modules" width="500"/> + <region name="External Modules" width="200"/> + </regions> +</casa> Added: trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/ComponentInformation.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/ComponentInformation.xml (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSEIPCA/src/conf/ComponentInformation.xml 2009-03-25 09:35:41 UTC (rev 104) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component-info-list> + <component-info> + <description>Database binding</description> + <name>sun-database-binding</name> + <state>Installed</state> + <type>binding</type> + </component-info> + <component-info> + <description>File Binding</description> + <name>sun-file-binding</name> + <state>Installed</state> + <ty... [truncated message content] |
From: <pka...@us...> - 2009-03-25 09:35:05
|
Revision: 103 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=103&view=rev Author: pkasprzak Date: 2009-03-25 09:34:55 +0000 (Wed, 25 Mar 2009) Log Message: ----------- Import Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/ trunk/sandbox/lsf-adapter-demo/CSEIPCA/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-24 18:21:45
|
Revision: 102 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=102&view=rev Author: idueppe Date: 2009-03-24 18:20:47 +0000 (Tue, 24 Mar 2009) Log Message: ----------- refactoring of pom.xml Modified Paths: -------------- trunk/sandbox/cse-ip/pom.xml trunk/sandbox/cse-ip/sc-cdmm/pom.xml trunk/sandbox/cse-ip/sc-idmapper/pom.xml Modified: trunk/sandbox/cse-ip/pom.xml =================================================================== --- trunk/sandbox/cse-ip/pom.xml 2009-03-24 15:02:05 UTC (rev 101) +++ trunk/sandbox/cse-ip/pom.xml 2009-03-24 18:20:47 UTC (rev 102) @@ -62,15 +62,36 @@ <module>cse-ip-application</module> </modules> + <repositories> <repository> + <id>download-java-net</id> + <name>Repository Java.Net</name> + <url>http://download.java.net/maven/2</url> + <layout>default</layout> + </repository> + <repository> <id>java-net</id> <name>Java.Net</name> <layout>legacy</layout> - <url>https://maven-repository.dev.java.net/nonav/repository</url> + <url>https://maven-repository.dev.java.net/repository</url> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>download-java-net</id> + <name>Repository Java.Net</name> + <url>http://download.java.net/maven/2</url> + <layout>default</layout> + </pluginRepository> + <pluginRepository> + <id>java-net</id> + <name>Java.Net</name> + <layout>legacy</layout> + <url>https://maven-repository.dev.java.net/repository</url> + </pluginRepository> + </pluginRepositories> <build> <defaultGoal>install</defaultGoal> <plugins> @@ -100,6 +121,9 @@ org.eclipse.wst.common.project.facet.core.nature </projectnature> </additionalProjectnatures> + <classpathContainers> + <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> + </classpathContainers> </configuration> </plugin> <plugin> @@ -173,6 +197,11 @@ <dependencyManagement> <dependencies> <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.4</version> @@ -204,6 +233,18 @@ <version>5.2.0</version> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4j.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> @@ -211,12 +252,12 @@ <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> - <version>2.4</version> + <version>${commons-lang.version}</version> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <version>${commons-collections.version}</version> </dependency> <dependency> <groupId>org.springframework</groupId> @@ -228,6 +269,18 @@ <artifactId>spring-beans</artifactId> <version>${spring.version}</version> </dependency> + <dependency> + <groupId>mysql</groupId> + <artifactId>mysql-connector-java</artifactId> + <version>${mysql.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>toplink.essentials</groupId> + <artifactId>toplink-essentials</artifactId> + <version>2.1-60f</version> + <scope>test</scope> + </dependency> </dependencies> </dependencyManagement> @@ -238,8 +291,10 @@ <spring.version>2.5.6</spring.version> <jaxb-impl.version>2.1.7</jaxb-impl.version> <mysql.version>5.1.6</mysql.version> + <commons-lang.version>2.4</commons-lang.version> + <commons-collections.version>3.2.1</commons-collections.version> <slf4j.version>1.5.6</slf4j.version> - <toplink.version>2.1-60f</toplink.version> + <!-- TEST Bibliotheken --> </properties> </project> \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/pom.xml =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/pom.xml 2009-03-24 15:02:05 UTC (rev 101) +++ trunk/sandbox/cse-ip/sc-cdmm/pom.xml 2009-03-24 18:20:47 UTC (rev 102) @@ -11,7 +11,7 @@ <groupId>de.campussource.cse</groupId> <artifactId>sc-cdmm</artifactId> <packaging>ejb</packaging> - <name>Service Component Canonical Date Model Manager</name> + <name>Service Component Canonical Data Model Manager</name> <version>1.0-SNAPSHOT</version> <dependencies> @@ -30,8 +30,6 @@ <dependency> <groupId>javax.persistence</groupId> <artifactId>persistence-api</artifactId> - <version>1.0</version> - <scope>compile</scope> </dependency> <dependency> <groupId>commons-lang</groupId> @@ -44,7 +42,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.version}</version> <scope>test</scope> </dependency> <dependency> @@ -55,13 +52,11 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j.version}</version> <scope>test</scope> </dependency> <!-- <dependency> --> @@ -73,7 +68,6 @@ <dependency> <groupId>toplink.essentials</groupId> <artifactId>toplink-essentials</artifactId> - <version>${toplink.version}</version> <scope>test</scope> </dependency> <dependency> Modified: trunk/sandbox/cse-ip/sc-idmapper/pom.xml =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/pom.xml 2009-03-24 15:02:05 UTC (rev 101) +++ trunk/sandbox/cse-ip/sc-idmapper/pom.xml 2009-03-24 18:20:47 UTC (rev 102) @@ -44,7 +44,6 @@ <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> - <version>${mysql.version}</version> <scope>test</scope> </dependency> <dependency> @@ -64,16 +63,9 @@ <version>${slf4j.version}</version> <scope>test</scope> </dependency> -<!-- <dependency> --> -<!-- <groupId>org.hibernate</groupId> --> -<!-- <artifactId>hibernate-entitymanager</artifactId> --> -<!-- <version>3.4.0.GA</version> --> -<!-- <scope>test</scope>--> -<!-- </dependency> --> <dependency> <groupId>toplink.essentials</groupId> <artifactId>toplink-essentials</artifactId> - <version>${toplink.version}</version> <scope>test</scope> </dependency> <dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-03-24 15:02:28
|
Revision: 101 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=101&view=rev Author: roekens Date: 2009-03-24 15:02:05 +0000 (Tue, 24 Mar 2009) Log Message: ----------- added javadoc Modified Paths: -------------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/AttributeAdapter.java 2009-03-24 15:02:05 UTC (rev 101) @@ -6,6 +6,11 @@ import de.campussource.cse.cdmm.domain.PersistentAttribute; import de.campussource.cse.cdmm.domain.TransientAttribute; +/** + * Attribute Adapter to map transient and persistent attributes + * @author Sebastian Roekens + * + */ public class AttributeAdapter extends XmlAdapter<Attribute, Attribute>{ Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/Constants.java 2009-03-24 15:02:05 UTC (rev 101) @@ -1,5 +1,11 @@ package de.campussource.cse.cdmm; +/** + * + * Class containing all String of package to prevent multiple definitions of same Strings + * @author Sebastian Roekens + * + */ public class Constants{ //namespace public static final String NAMESPACE_DATATYPES="http://cse.campussource.de/DataTypes"; Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-03-24 15:02:05 UTC (rev 101) @@ -8,43 +8,145 @@ import de.campussource.cse.cdmm.domain.Group; import de.campussource.cse.cdmm.domain.Role; +/** + * Service bean for CDMM package + * @author Sebastian Roekens + * + */ @Remote public interface DataModelManager { + /** + * Service method to persist category entities + * @param category category to persist + * @return + * @throws DataModelManagerException + */ public CSEMessage saveCategory(Category category) throws DataModelManagerException; + /** + * Service method to delete category entities + * @param category category to delete + * @return + * @throws DataModelManagerException + */ public CSEMessage deleteCategory(Category category) throws DataModelManagerException; + /** + * Service method to retrieve a category by id + * @param categoryId id of searched category + * @return + * @throws DataModelManagerException + */ public CSEMessage retrieveCategory(long categoryId) throws DataModelManagerException; + /** + * Service method to persist course entities + * @param course course to persist + * @return + * @throws DataModelManagerException + */ public CSEMessage saveCourse(Course course) throws DataModelManagerException; + /** + * Service method to delete course entities + * @param course course to delete + * @return + * @throws DataModelManagerException + */ public CSEMessage deleteCourse(Course course) throws DataModelManagerException; + /** + * Service method to retrieve a course by id + * @param courseId id of searched course + * @return + * @throws DataModelManagerException + */ public CSEMessage retrieveCourse(long courseId) throws DataModelManagerException; + /** + * Service method to persist role entities + * @param role role to persist + * @return + * @throws DataModelManagerException + */ public CSEMessage saveRole(Role role) throws DataModelManagerException; + /** + * Service method to delete role entities + * @param role role to delete + * @return + * @throws DataModelManagerException + */ public CSEMessage deleteRole(Role role) throws DataModelManagerException; + /** + * Service method to retrieve an role entity by id + * @param roleId id of searched role entity + * @return + * @throws DataModelManagerException + */ public CSEMessage retrieveRole(long roleId) throws DataModelManagerException; + /** + * Service method to retrieve an role entity by account and course + * @param accountId id of account reference of role + * @param courseId id of course reference of role + * @return + * @throws DataModelManagerException + */ public CSEMessage retrieveRole(long accountId, long courseId) throws DataModelManagerException; + /** + * Service method to persist account entities + * @param account account to persist + * @return + * @throws DataModelManagerException + */ public CSEMessage saveAccount(Account account) throws DataModelManagerException; + /** + * Service method to delete account entities + * @param account account to delete + * @return + * @throws DataModelManagerException + */ public CSEMessage deleteAccount(Account account) throws DataModelManagerException; + /** + * Service method to retrieve account entities by id + * @param accountId id of searched account entity + * @return + * @throws DataModelManagerException + */ public CSEMessage retrieveAccount(long accountId) throws DataModelManagerException; + /** + * Service method to retrieve Group entities by id + * @param groupId id of searched group entity + * @return + * @throws DataModelManagerException + */ public CSEMessage retrieveGroup(long groupId) throws DataModelManagerException; + /** + * Service method to persist Group entities + * @param group group to persist + * @return + * @throws DataModelManagerException + */ public CSEMessage saveGroup(Group group) throws DataModelManagerException; + /** + * Service method to delete group entities + * @param group group to delete + * @return + * @throws DataModelManagerException + */ public CSEMessage deleteGroup(Group group) throws DataModelManagerException; Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 15:02:05 UTC (rev 101) @@ -14,6 +14,11 @@ import de.campussource.cse.cdmm.domain.Group; import de.campussource.cse.cdmm.domain.Role; +/** + * Service bean for CDMM package + * @author Sebastian Roekens + * + */ @Stateless public class DataModelManagerBean implements DataModelManager { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdAdapter.java 2009-03-24 15:02:05 UTC (rev 101) @@ -2,6 +2,11 @@ import javax.xml.bind.annotation.adapters.XmlAdapter; +/** + * Adapter class to convert ids from String to Long and back + * @author Sebastian Roekens + * + */ public class IdAdapter extends XmlAdapter<String, Long>{ Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java 2009-03-24 15:02:05 UTC (rev 101) @@ -1,7 +1,8 @@ package de.campussource.cse.cdmm; /** - * + * Exception to represent failed searches for objects + * e.g. no objetc with given id existing * @author Sebastian Roekens */ public class IdNotFoundException extends DataModelManagerException { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java 2009-03-24 15:02:05 UTC (rev 101) @@ -1,7 +1,7 @@ package de.campussource.cse.cdmm; /** - * + * Exception to represent missing attributes in objects which shall be persisted * @author Sebastian Roekens */ public class MissingAttributeException extends DataModelManagerException { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-03-24 15:02:05 UTC (rev 101) @@ -1,7 +1,7 @@ package de.campussource.cse.cdmm; /** - * + * Exception to represent missing parameters in method calls * @author Sebastian Roekens */ public class MissingParameterException extends DataModelManagerException { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java 2009-03-24 15:02:05 UTC (rev 101) @@ -2,6 +2,11 @@ import de.campussource.cse.cdmm.domain.Account; +/** + * DAO Class for Account entity + * @author Sebastian Roekens + * + */ public class AccountDao extends DAOJPA<Account> { } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java 2009-03-24 15:02:05 UTC (rev 101) @@ -2,6 +2,11 @@ import de.campussource.cse.cdmm.domain.Category; +/** + * DAO Class for Category entity + * @author Sebastian Roekens + * + */ public class CategoryDao extends DAOJPA<Category>{ } \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java 2009-03-24 15:02:05 UTC (rev 101) @@ -2,6 +2,11 @@ import de.campussource.cse.cdmm.domain.Course; +/** + * DAO Class for Course entity + * @author Sebastian Roekens + * + */ public class CourseDao extends DAOJPA<Course> { } \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-03-24 15:02:05 UTC (rev 101) @@ -4,12 +4,33 @@ import de.campussource.cse.cdmm.DataModelManagerException; +/** + * @author Ingo D\xFCppe + * Interface for DAO Classes of entities + * @param <T> + */ public interface DAO<T> { + /** + * Finder method to find persisted entities by id + * @param id id of searched object + * @return entity object with given id + * @throws DataModelManagerException + */ public T find(Serializable id) throws DataModelManagerException; + /** + * DAO method to persist given object + * @param entity object to persist + * @throws DataModelManagerException + */ public void persist(T entity) throws DataModelManagerException; + /** + * DAO method to delete entity objects + * @param entity object to delete + * @throws DataModelManagerException + */ public void remove(T entity) throws DataModelManagerException; } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 15:02:05 UTC (rev 101) @@ -13,6 +13,12 @@ import de.campussource.cse.cdmm.MissingParameterException; +/** + * Abstract DAO class for entities + * @author Ingo D\xFCppe + * + * @param <E> Entity type of DAO class + */ public abstract class DAOJPA<E> implements DAO<E> { @PersistenceContext Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java 2009-03-24 15:02:05 UTC (rev 101) @@ -2,6 +2,11 @@ import de.campussource.cse.cdmm.domain.Group; +/** + * DAO Class for Group entity + * @author Sebastian Roekens + * + */ public class GroupDao extends DAOJPA<Group> { } \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-24 15:02:05 UTC (rev 101) @@ -10,6 +10,11 @@ import de.campussource.cse.cdmm.MissingParameterException; import de.campussource.cse.cdmm.domain.Role; +/** + * DAO Class for Role entity + * @author Sebastian Roekens + * + */ public class RoleDao extends DAOJPA<Role> { @Override @@ -38,6 +43,13 @@ super.remove(role); } + /** + * Search method to find a role with given course and account reference + * @param accountId id of account reference of searched role + * @param courseId id of course reference of searched role + * @return role object with given account and course reference + * @throws DataModelManagerException Exception is thrown, when no role with given accountId and courseId exists + */ public Role retrieveRole(long accountId, long courseId) throws DataModelManagerException{ if (accountId == 0){ throw new MissingParameterException("Paramter accountId is mandatory!"); Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-24 15:02:05 UTC (rev 101) @@ -18,8 +18,16 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + import de.campussource.cse.cdmm.Constants; +/** + * Account entity object + * @author Sebastian Roekens + * + */ @Entity(name=Constants.ACCOUNT) @Table(name = Constants.TABLENAME_ACCOUNT) @Inheritance(strategy=InheritanceType.JOINED) @@ -44,6 +52,11 @@ setId(id); } + /** + * Convenience method to add an account to a group + * @param group group account should be added to + * @return success of operation + */ public boolean addToGroup(Group group){ if(group==null){ return false; @@ -66,6 +79,11 @@ return true; } + /** + * Convenience method to remove an account from a group + * @param group group to remove account from + * @return success of operation + */ public boolean removeFromGroup(Group group){ if (group == null){ return false; @@ -82,6 +100,11 @@ return true; } + /** + * Convenience method to check if account is member of a group + * @param group group to check membership of + * @return membership state of account and given group + */ public boolean isInGroup(Group group){ if (group == null){ return false; @@ -92,6 +115,34 @@ return (group.getMembers().contains(this)); } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof Account)) { + return false; + } + if (this.getId() == null) { + return false; + } else { + return this.getId().equals(((Account) obj).getId()); + } + } + + @Override + public int hashCode() { + if (this.getId() == null) { + return super.hashCode(); + } else { + return this.getId().hashCode(); + } + } + + public String toString() { + return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString(); + } + @XmlElementWrapper(name=Constants.ROLES) @XmlElement(name=Constants.ROLE) public List<Role> getRoles() { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-24 15:02:05 UTC (rev 101) @@ -10,6 +10,11 @@ import de.campussource.cse.cdmm.AttributeAdapter; import de.campussource.cse.cdmm.Constants; +/** + * Attribute entity object + * @author Sebastian Roekens + * + */ @XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) @XmlType(namespace=Constants.NAMESPACE_DATATYPES) @XmlJavaTypeAdapter(value=AttributeAdapter.class) Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-24 15:02:05 UTC (rev 101) @@ -21,6 +21,11 @@ import de.campussource.cse.cdmm.Constants; +/** + * Category entity object + * @author Sebastian Roekens + * + */ @Entity(name=Constants.CATEGORY) @Inheritance(strategy=InheritanceType.JOINED) @Table(name = Constants.TABLENAME_CATEGORY) Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-24 15:02:05 UTC (rev 101) @@ -24,6 +24,11 @@ import de.campussource.cse.cdmm.Constants; +/** + * Course entity object + * @author Sebastian Roekens + * + */ @Entity(name=Constants.COURSE) @Table(name = Constants.TABLENAME_COURSE) @Inheritance(strategy=InheritanceType.JOINED) Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 15:02:05 UTC (rev 101) @@ -24,6 +24,11 @@ import de.campussource.cse.cdmm.Constants; import de.campussource.cse.cdmm.IdAdapter; +/** + * Entity object - super class of other entity types + * @author Sebastian Roekens + * + */ @javax.persistence.Entity(name=Constants.ENTITY) @Table(name = Constants.TABLENAME_ENTITY) @Inheritance(strategy=InheritanceType.JOINED) @@ -45,6 +50,7 @@ this.id = id; } + @Override public boolean equals(Object obj) { if (this == obj) { return true; @@ -59,6 +65,7 @@ } } + @Override public int hashCode() { if (this.id == null) { return super.hashCode(); @@ -67,6 +74,7 @@ } } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(id).toString(); } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-24 15:02:05 UTC (rev 101) @@ -14,6 +14,11 @@ import de.campussource.cse.cdmm.Constants; +/** + * Container class for entity objects + * @author Sebastian Roekens + * + */ @XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) @XmlType(namespace=Constants.NAMESPACE_DATATYPES) public class EntityContainer{ Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-24 15:02:05 UTC (rev 101) @@ -19,6 +19,11 @@ import de.campussource.cse.cdmm.Constants; +/** + * Group entity object + * @author Sebastian Roekens + * + */ @Entity(name=Constants.GROUP) @Table(name = Constants.TABLENAME_GROUP) @Inheritance(strategy=InheritanceType.JOINED) @@ -36,7 +41,8 @@ setId(id); } - public boolean equals(Object obj) { + @Override + public boolean equals(Object obj) { if (this == obj) { return true; } @@ -50,6 +56,7 @@ } } + @Override public int hashCode() { if (this.getId() == null) { return super.hashCode(); @@ -58,6 +65,7 @@ } } + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(this.getId()).toString(); } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/PersistentAttribute.java 2009-03-24 15:02:05 UTC (rev 101) @@ -6,6 +6,11 @@ import de.campussource.cse.cdmm.Constants; +/** + * Representation of an persistent attribute + * @author Sebastian Roekens + * + */ @XmlTransient public class PersistentAttribute extends Attribute { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-24 15:02:05 UTC (rev 101) @@ -22,6 +22,11 @@ import de.campussource.cse.cdmm.Constants; +/** + * Role entity object + * @author Sebastian Roekens + * + */ @Entity(name=Constants.ROLE) @Table(name = Constants.TABLENAME_ROLE) @Inheritance(strategy=InheritanceType.JOINED) Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/RoleType.java 2009-03-24 15:02:05 UTC (rev 101) @@ -6,6 +6,15 @@ import de.campussource.cse.cdmm.Constants; +/** + * Role Type to differentiate 3 types of roles: + * UNDEFINED - if role type cannot be defined + * PARTICIPANT - if account participates in a course + * ASSISTANT - if account is an assistant in a course + * + * @author Sebastian Roekens + * + */ @XmlEnum @XmlType(namespace=Constants.NAMESPACE_DATATYPES) public enum RoleType{ Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-24 14:21:24 UTC (rev 100) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/TransientAttribute.java 2009-03-24 15:02:05 UTC (rev 101) @@ -2,6 +2,11 @@ import javax.xml.bind.annotation.XmlTransient; +/** + * Representation of an attribute object, which should not be saved persistent + * @author Sebastian Roekens + * + */ @XmlTransient public class TransientAttribute extends Attribute { public TransientAttribute(){} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-03-24 14:21:35
|
Revision: 100 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=100&view=rev Author: roekens Date: 2009-03-24 14:21:24 +0000 (Tue, 24 Mar 2009) Log Message: ----------- removed not needed imports Modified Paths: -------------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-03-24 14:21:24 UTC (rev 100) @@ -1,7 +1,5 @@ package de.campussource.cse.cdmm; -import de.campussource.cse.cdmm.DataModelManagerException; - /** * * @author Sebastian Roekens Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/AccountDao.java 2009-03-24 14:21:24 UTC (rev 100) @@ -1,5 +1,5 @@ package de.campussource.cse.cdmm.dao; -import de.campussource.cse.cdmm.dao.DAOJPA; + import de.campussource.cse.cdmm.domain.Account; public class AccountDao extends DAOJPA<Account> { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CategoryDao.java 2009-03-24 14:21:24 UTC (rev 100) @@ -1,6 +1,5 @@ package de.campussource.cse.cdmm.dao; -import de.campussource.cse.cdmm.dao.DAOJPA; import de.campussource.cse.cdmm.domain.Category; public class CategoryDao extends DAOJPA<Category>{ Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/CourseDao.java 2009-03-24 14:21:24 UTC (rev 100) @@ -1,5 +1,5 @@ package de.campussource.cse.cdmm.dao; -import de.campussource.cse.cdmm.dao.DAOJPA; + import de.campussource.cse.cdmm.domain.Course; public class CourseDao extends DAOJPA<Course> { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/GroupDao.java 2009-03-24 14:21:24 UTC (rev 100) @@ -1,5 +1,5 @@ package de.campussource.cse.cdmm.dao; -import de.campussource.cse.cdmm.dao.DAOJPA; + import de.campussource.cse.cdmm.domain.Group; public class GroupDao extends DAOJPA<Group> { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-24 14:21:24 UTC (rev 100) @@ -8,7 +8,6 @@ import de.campussource.cse.cdmm.IdNotFoundException; import de.campussource.cse.cdmm.MissingAttributeException; import de.campussource.cse.cdmm.MissingParameterException; -import de.campussource.cse.cdmm.dao.DAOJPA; import de.campussource.cse.cdmm.domain.Role; public class RoleDao extends DAOJPA<Role> { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 14:21:24 UTC (rev 100) @@ -99,7 +99,11 @@ public void setAttributes(List<Attribute> attributes) { List<Attribute> newAttributeList = new ArrayList<Attribute>(); for (Attribute att : attributes){ - if (att.isPersistent() ? newAttributeList.add(attribute2PersistentAttribute(att)) : newAttributeList.add(attribute2TransientAttribute(att))); + if (att.isPersistent()){ + newAttributeList.add(attribute2PersistentAttribute(att)); + } else{ + newAttributeList.add(attribute2TransientAttribute(att)); + } } this.attributes = newAttributeList; } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-24 14:09:33 UTC (rev 99) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-24 14:21:24 UTC (rev 100) @@ -21,7 +21,6 @@ import javax.xml.bind.annotation.XmlType; import de.campussource.cse.cdmm.Constants; -import de.campussource.cse.cdmm.domain.RoleType; @Entity(name=Constants.ROLE) @Table(name = Constants.TABLENAME_ROLE) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-03-24 14:09:55
|
Revision: 99 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=99&view=rev Author: roekens Date: 2009-03-24 14:09:33 +0000 (Tue, 24 Mar 2009) Log Message: ----------- - removed warnings - completed code coverage to 100% Modified Paths: -------------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 13:52:47 UTC (rev 98) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 14:09:33 UTC (rev 99) @@ -7,8 +7,6 @@ import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; -import org.apache.commons.lang.Validate; - import de.campussource.cse.cdmm.dao.*; import de.campussource.cse.cdmm.domain.Account; import de.campussource.cse.cdmm.domain.Category; @@ -122,8 +120,6 @@ @Override @TransactionAttribute(TransactionAttributeType.REQUIRED) public CSEMessage retrieveRole(long accountId, long courseId) throws DataModelManagerException { - Validate.notNull(accountId,"DataModelManagerBean.retrieveRole: Parameter accountId is mandatory."); - Validate.notNull(courseId,"DataModelManagerBean.retrieveRole: Parameter courseId is mandatory."); Role role = roleDao.retrieveRole(accountId, courseId); CSEMessage csem = new CSEMessageImpl(); csem.addEntity(role); Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 13:52:47 UTC (rev 98) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 14:09:33 UTC (rev 99) @@ -2,7 +2,6 @@ import java.io.Serializable; import java.lang.reflect.ParameterizedType; -import java.net.IDN; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; @@ -21,6 +20,7 @@ private Class<E> persistentClass; + @SuppressWarnings("unchecked") public DAOJPA() { this.persistentClass = (Class<E>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 13:52:47 UTC (rev 98) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 14:09:33 UTC (rev 99) @@ -13,7 +13,6 @@ import javax.persistence.Transient; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlID; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; @@ -84,7 +83,6 @@ } @XmlElementWrapper(name=Constants.ATTRIBUTES) - //@XmlElements(value={@XmlElement(name=Constants.ATTRIBUTE,type=Attribute.class), @XmlElement(name=Constants.ATTRIBUTE,type=TransientAttribute.class), @XmlElement(name=Constants.ATTRIBUTE, type=PersistentAttribute.class)}) @XmlElement(name=Constants.ATTRIBUTE) public List<Attribute> getAttributes() { return attributes; Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-03-24 13:52:47 UTC (rev 98) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-03-24 14:09:33 UTC (rev 99) @@ -6,7 +6,6 @@ import org.junit.Test; import de.campussource.cse.cdmm.dao.AccountDao; -import de.campussource.cse.cdmm.domain.Entity; import de.campussource.cse.common.test.AbstractPersistentUnitTest; public class DaoTest extends AbstractPersistentUnitTest { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-24 13:52:47 UTC (rev 98) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-24 14:09:33 UTC (rev 99) @@ -4,12 +4,6 @@ import java.util.List; -import javax.ejb.TransactionAttribute; -import javax.ejb.TransactionAttributeType; -import javax.persistence.NoResultException; -import javax.persistence.Query; - -import org.apache.commons.lang.Validate; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; @@ -20,6 +14,7 @@ import de.campussource.cse.cdmm.domain.Entity; import de.campussource.cse.cdmm.domain.Group; import de.campussource.cse.cdmm.domain.Role; +import de.campussource.cse.cdmm.domain.RoleType; import de.campussource.cse.common.test.AbstractPersistentUnitTest; public class DataModelManagerBeanTest extends AbstractPersistentUnitTest { @@ -269,6 +264,7 @@ } assertNull(csem); Role role = new Role(roleId); + role.setType(RoleType.ASSISTANT); try { dmm.saveRole(role); fail("Creating of role without account and course reference should be impossible"); @@ -315,7 +311,86 @@ @Test public void testRoleQueries(){ + long roleId = uniqueId(); + CSEMessage csem = null; + try { + csem = dmm.retrieveRole(roleId); + fail("Exception should occur"); + } catch (DataModelManagerException e) { + // Exception should occur + } + assertNull(csem); + Role role = new Role(roleId); + role.setType(RoleType.ASSISTANT); + try { + dmm.saveRole(role); + fail("Creating of role without account and course reference should be impossible"); + } catch (DataModelManagerException e) { + //Exception should occur; + } + Account account = new Account (uniqueId()); + Course course = new Course (uniqueId()); + try{ + dmm.saveAccount(account); + dmm.saveCourse(course); + } catch (DataModelManagerException e){ + fail("Unexpected DataModelManager Exception"); + } + role.addToCourseAndAccount(course, account); + try { + dmm.saveRole(role); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + csem = null; + try { + csem = dmm.retrieveRole(roleId); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of role failed"); + } + assertNotNull(csem); + assertEquals(1, csem.getEntities().size()); + assertEquals(role, csem.getEntities().get(0)); + csem = null; + try { + csem = dmm.retrieveRole(0, course.getId()); + fail("DataModelManagerException expected"); + } catch (DataModelManagerException e) { + // Exception expected + } + + csem = null; + try { + csem = dmm.retrieveRole(account.getId(), 0); + fail("DataModelManagerException expected"); + } catch (DataModelManagerException e) { + // Exception expected + } + + csem = null; + try { + csem = dmm.retrieveRole(1l, 1l); + fail("DataModelManagerException expected"); + } catch (DataModelManagerException e) { + // Exception expected + } + + csem = null; + try { + csem = dmm.retrieveRole(account.getId(), course.getId()); + } catch (DataModelManagerException e) { + fail("role could not be retrieved"); + } + assertNotNull(csem); + assertEquals(role, csem.getEntities().get(0)); + } + @Test + public void testConstants(){ + @SuppressWarnings("unused") + Constants constants = new Constants(); + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-03-24 13:56:31
|
Revision: 98 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=98&view=rev Author: roekens Date: 2009-03-24 13:52:47 +0000 (Tue, 24 Mar 2009) Log Message: ----------- Massive changes: - introduction of exceptions for cdmm project - several bugfixes - many added tests to improve code coverage Modified Paths: -------------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java Added Paths: ----------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CSEMessageTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingAttributeExceptionTest.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/MissingParameterExceptionTest.java Removed Paths: ------------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManager.java 2009-03-24 13:52:47 UTC (rev 98) @@ -10,52 +10,42 @@ @Remote public interface DataModelManager { - public CSEMessage saveCategory(Category category); + public CSEMessage saveCategory(Category category) throws DataModelManagerException; - public CSEMessage saveCategoryHierarchy(Category category); + public CSEMessage deleteCategory(Category category) throws DataModelManagerException; - public CSEMessage deleteCategory(Category category); + public CSEMessage retrieveCategory(long categoryId) throws DataModelManagerException; - public CSEMessage retrieveCategoryHierarchy(long categoryId); - public CSEMessage retrieveCategory(long categoryId); + public CSEMessage saveCourse(Course course) throws DataModelManagerException; + public CSEMessage deleteCourse(Course course) throws DataModelManagerException; - public CSEMessage saveCourse(Course course); - - public CSEMessage saveCourseHierarchy(Course course); - - public CSEMessage deleteCourse(Course course); - - public CSEMessage retrieveCourse(long courseId); + public CSEMessage retrieveCourse(long courseId) throws DataModelManagerException; - public CSEMessage retrieveCourseHierarchy(long courseId); + public CSEMessage saveRole(Role role) throws DataModelManagerException; + public CSEMessage deleteRole(Role role) throws DataModelManagerException; + public CSEMessage retrieveRole(long roleId) throws DataModelManagerException; - public CSEMessage saveRole(Role role); + public CSEMessage retrieveRole(long accountId, long courseId) throws DataModelManagerException; - public CSEMessage deleteRole(Role role); - public CSEMessage retrieveRole(long roleId); - public CSEMessage retrieveRole(long accountId, long courseId); + public CSEMessage saveAccount(Account account) throws DataModelManagerException; + public CSEMessage deleteAccount(Account account) throws DataModelManagerException; + public CSEMessage retrieveAccount(long accountId) throws DataModelManagerException; - public CSEMessage saveAccount(Account account); - public CSEMessage deleteAccount(Account account); + public CSEMessage retrieveGroup(long groupId) throws DataModelManagerException; - public CSEMessage retrieveAccount(long accountId); + public CSEMessage saveGroup(Group group) throws DataModelManagerException; + public CSEMessage deleteGroup(Group group) throws DataModelManagerException; - public CSEMessage retrieveGroup(long groupId); - public CSEMessage saveGroup(Group group); - - public CSEMessage deleteGroup(Group group); - - } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 13:52:47 UTC (rev 98) @@ -1,11 +1,14 @@ package de.campussource.cse.cdmm; -import java.util.ArrayList; import java.util.List; import javax.ejb.EJB; import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import org.apache.commons.lang.Validate; + import de.campussource.cse.cdmm.dao.*; import de.campussource.cse.cdmm.domain.Account; import de.campussource.cse.cdmm.domain.Category; @@ -26,16 +29,13 @@ private CourseDao courseDao; @EJB - private EntityDao entityDao; - - @EJB private GroupDao groupDao; @EJB private RoleDao roleDao; @Override - public CSEMessage deleteAccount(Account account) { + public CSEMessage deleteAccount(Account account) throws DataModelManagerException { if (account.getGroups()!=null && account.getGroups().size()!=0){ for (Group group : account.getGroups()){ List<Account> members = group.getMembers(); @@ -49,19 +49,19 @@ } @Override - public CSEMessage deleteCategory(Category category) { + public CSEMessage deleteCategory(Category category) throws DataModelManagerException { categoryDao.remove(category); return null; } @Override - public CSEMessage deleteCourse(Course course) { + public CSEMessage deleteCourse(Course course) throws DataModelManagerException { courseDao.remove(course); return null; } @Override - public CSEMessage deleteGroup(Group group) { + public CSEMessage deleteGroup(Group group) throws DataModelManagerException { while (group.getMembers()!=null && group.getMembers().size()!=0){ Account account = group.getMembers().get(0); account.removeFromGroup(group); @@ -72,13 +72,13 @@ } @Override - public CSEMessage deleteRole(Role role) { + public CSEMessage deleteRole(Role role) throws DataModelManagerException { roleDao.remove(role); return null; } @Override - public CSEMessage retrieveAccount(long accountId) { + public CSEMessage retrieveAccount(long accountId) throws DataModelManagerException { Account account = accountDao.find(accountId); CSEMessage csem = new CSEMessageImpl(); csem.addEntity(account); @@ -86,7 +86,7 @@ } @Override - public CSEMessage retrieveCategory(long categoryId) { + public CSEMessage retrieveCategory(long categoryId) throws DataModelManagerException { Category category = categoryDao.find(categoryId); CSEMessage csem = new CSEMessageImpl(); csem.addEntity(category); @@ -95,15 +95,7 @@ } @Override - public CSEMessage retrieveCategoryHierarchy(long categoryId) { - Category category = categoryDao.find(categoryId); - CSEMessage csem = new CSEMessageImpl(); - csem.addEntity(category); - return csem; - } - - @Override - public CSEMessage retrieveCourse(long courseId) { + public CSEMessage retrieveCourse(long courseId) throws DataModelManagerException { //TODO cut workgroups or define new method in dao Course course = courseDao.find(courseId); CSEMessage csem = new CSEMessageImpl(); @@ -112,15 +104,7 @@ } @Override - public CSEMessage retrieveCourseHierarchy(long courseId) { - Course course = courseDao.find(courseId); - CSEMessage csem = new CSEMessageImpl(); - csem.addEntity(course); - return csem; - } - - @Override - public CSEMessage retrieveGroup(long groupId) { + public CSEMessage retrieveGroup(long groupId) throws DataModelManagerException { Group group = groupDao.find(groupId); CSEMessage csem = new CSEMessageImpl(); csem.addEntity(group); @@ -128,7 +112,7 @@ } @Override - public CSEMessage retrieveRole(long roleId) { + public CSEMessage retrieveRole(long roleId) throws DataModelManagerException { Role role = roleDao.find(roleId); CSEMessage csem = new CSEMessageImpl(); csem.addEntity(role); @@ -136,50 +120,42 @@ } @Override - public CSEMessage retrieveRole(long accountId, long courseId) { - //TODO define new dao method - //Role role = roleDao. - return null; + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public CSEMessage retrieveRole(long accountId, long courseId) throws DataModelManagerException { + Validate.notNull(accountId,"DataModelManagerBean.retrieveRole: Parameter accountId is mandatory."); + Validate.notNull(courseId,"DataModelManagerBean.retrieveRole: Parameter courseId is mandatory."); + Role role = roleDao.retrieveRole(accountId, courseId); + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(role); + return csem; } @Override - public CSEMessage saveAccount(Account account) { + public CSEMessage saveAccount(Account account) throws DataModelManagerException { accountDao.persist(account); return null; } @Override - public CSEMessage saveCategory(Category category) { + public CSEMessage saveCategory(Category category) throws DataModelManagerException { categoryDao.persist(category); return null; } @Override - public CSEMessage saveCategoryHierarchy(Category category) { - categoryDao.persist(category); - return null; - } - - @Override - public CSEMessage saveCourse(Course course) { + public CSEMessage saveCourse(Course course) throws DataModelManagerException { courseDao.persist(course); return null; } @Override - public CSEMessage saveCourseHierarchy(Course course) { - courseDao.persist(course); - return null; - } - - @Override - public CSEMessage saveGroup(Group group) { + public CSEMessage saveGroup(Group group) throws DataModelManagerException { groupDao.persist(group); return null; } @Override - public CSEMessage saveRole(Role role) { + public CSEMessage saveRole(Role role) throws DataModelManagerException { roleDao.persist(role); return null; } Added: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerException.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,26 @@ +package de.campussource.cse.cdmm; + +/** + * General CDMM exception + * @author Sebastian Roekens + */ +public class DataModelManagerException extends Exception { + + private static final long serialVersionUID = -2553188081269164041L; + + public DataModelManagerException() { + } + + public DataModelManagerException(String message) { + super(message); + } + + public DataModelManagerException(Throwable cause) { + super(cause); + } + + public DataModelManagerException(String message, Throwable cause) { + super(message, cause); + } + +} \ No newline at end of file Added: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/IdNotFoundException.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,25 @@ +package de.campussource.cse.cdmm; + +/** + * + * @author Sebastian Roekens + */ +public class IdNotFoundException extends DataModelManagerException { + + private static final long serialVersionUID = 3260263352045745859L; + + public IdNotFoundException() {} + + public IdNotFoundException(String message) { + super(message); + } + + public IdNotFoundException(Throwable cause) { + super(cause); + } + + public IdNotFoundException(String message, Throwable cause) { + super(message, cause); + } + +} Added: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingAttributeException.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,25 @@ +package de.campussource.cse.cdmm; + +/** + * + * @author Sebastian Roekens + */ +public class MissingAttributeException extends DataModelManagerException { + + private static final long serialVersionUID = 3260263352045745856L; + + public MissingAttributeException() {} + + public MissingAttributeException(String message) { + super(message); + } + + public MissingAttributeException(Throwable cause) { + super(cause); + } + + public MissingAttributeException(String message, Throwable cause) { + super(message, cause); + } + +} Added: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/MissingParameterException.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,27 @@ +package de.campussource.cse.cdmm; + +import de.campussource.cse.cdmm.DataModelManagerException; + +/** + * + * @author Sebastian Roekens + */ +public class MissingParameterException extends DataModelManagerException { + + private static final long serialVersionUID = 3260263352045745857L; + + public MissingParameterException() {} + + public MissingParameterException(String message) { + super(message); + } + + public MissingParameterException(Throwable cause) { + super(cause); + } + + public MissingParameterException(String message, Throwable cause) { + super(message, cause); + } + +} Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAO.java 2009-03-24 13:52:47 UTC (rev 98) @@ -2,12 +2,14 @@ import java.io.Serializable; +import de.campussource.cse.cdmm.DataModelManagerException; + public interface DAO<T> { - public T find(Serializable id); + public T find(Serializable id) throws DataModelManagerException; - public void persist(T entity); + public void persist(T entity) throws DataModelManagerException; - public void remove(T entity); + public void remove(T entity) throws DataModelManagerException; } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 13:52:47 UTC (rev 98) @@ -2,13 +2,18 @@ import java.io.Serializable; import java.lang.reflect.ParameterizedType; +import java.net.IDN; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import de.campussource.cse.cdmm.DataModelManagerException; +import de.campussource.cse.cdmm.IdNotFoundException; +import de.campussource.cse.cdmm.MissingParameterException; + public abstract class DAOJPA<E> implements DAO<E> { @PersistenceContext @@ -22,18 +27,25 @@ @Override @TransactionAttribute(TransactionAttributeType.SUPPORTS) - public E find(Serializable id) { - return entityManager.find(persistentClass, id); + public E find(Serializable id) throws DataModelManagerException{ + E result = entityManager.find(persistentClass, id); + if (result == null){ + throw new IdNotFoundException("Id: "+ id + "could not be found."); + } + return result; } @Override @TransactionAttribute(TransactionAttributeType.MANDATORY) - public void persist(E entity) { + public void persist(E entity) throws DataModelManagerException{ entityManager.persist(entity); } @Override - public void remove(E entity) { + public void remove(E entity) throws DataModelManagerException{ + if (entity == null){ + throw new MissingParameterException("Parameter entity is mandatory!"); + } entityManager.remove(entity); } Deleted: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/EntityDao.java 2009-03-24 13:52:47 UTC (rev 98) @@ -1,8 +0,0 @@ -package de.campussource.cse.cdmm.dao; - -import de.campussource.cse.cdmm.dao.DAOJPA; -import de.campussource.cse.cdmm.domain.Entity; - -public class EntityDao extends DAOJPA<Entity> { - -} Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/RoleDao.java 2009-03-24 13:52:47 UTC (rev 98) @@ -1,13 +1,34 @@ package de.campussource.cse.cdmm.dao; import java.util.List; +import javax.persistence.NoResultException; +import javax.persistence.Query; + +import de.campussource.cse.cdmm.DataModelManagerException; +import de.campussource.cse.cdmm.IdNotFoundException; +import de.campussource.cse.cdmm.MissingAttributeException; +import de.campussource.cse.cdmm.MissingParameterException; import de.campussource.cse.cdmm.dao.DAOJPA; import de.campussource.cse.cdmm.domain.Role; public class RoleDao extends DAOJPA<Role> { @Override - public void remove(Role role){ + public void persist(Role role) throws MissingAttributeException{ + if (role.getAccount()==null){ + throw new MissingAttributeException("RoleDao.persist: account reference for role object missing!"); + } + if (role.getCourse()==null){ + throw new MissingAttributeException("RoleDao.persist: course reference for role object missing!"); + } + entityManager.persist(role); + } + + @Override + public void remove(Role role) throws DataModelManagerException{ + if (role==null){ + throw new MissingParameterException("Parameter role is mandatory!"); + } List<Role> accountRoles = role.getAccount().getRoles(); List<Role> courseRoles = role.getCourse().getRoles(); accountRoles.remove(role); @@ -17,4 +38,22 @@ persist(role); super.remove(role); } + + public Role retrieveRole(long accountId, long courseId) throws DataModelManagerException{ + if (accountId == 0){ + throw new MissingParameterException("Paramter accountId is mandatory!"); + } + if (courseId == 0){ + throw new MissingParameterException("Paramter accountId is mandatory!"); + } + try { + Query query = entityManager.createNamedQuery(Role.FIND_BY_ACCOUNT_AND_COURSE); + query.setParameter("accountId", accountId); + query.setParameter("courseId", courseId); + return (Role) query.getSingleResult(); + } catch (NoResultException nre) { + throw new IdNotFoundException("No role with account id: "+accountId+" and course id: "+courseId+" could be found"); + } + } + } \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-24 13:52:47 UTC (rev 98) @@ -44,12 +44,6 @@ setId(id); } - public Account(Long id, List<Group> groups, List<Role> roles){ - setId(id); - this.groups = groups; - this.roles = roles; - } - public boolean addToGroup(Group group){ if(group==null){ return false; @@ -77,7 +71,7 @@ return false; } List<Group> groups = this.getGroups(); - if (!groups.contains(group)||!group.getMembers().contains(this)){ + if ((!(groups==null) && !groups.contains(group))||!group.getMembers().contains(this)){ return false; } groups.remove(group); Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Attribute.java 2009-03-24 13:52:47 UTC (rev 98) @@ -27,12 +27,6 @@ public Attribute(){ } - public Attribute(String name, String value, boolean persistent){ - this.name = name; - this.value = value; - this.persistent = persistent; - } - @XmlAttribute(name=Constants.PROPERTY_PERSISTENT) public boolean isPersistent() { return persistent; Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Category.java 2009-03-24 13:52:47 UTC (rev 98) @@ -45,14 +45,6 @@ setId(id); } - public Category(Long id, List<Category> children, List<Course> courses, Category parent){ - setId(id); - this.children = children; - this.courses = courses; - this.parent = parent; - } - - /** * Convenience method for dependency check to prevent circular dependencies. * True if circular dependency would be created. @@ -81,7 +73,7 @@ if (this.children == null){ this.children = new ArrayList<Category>(); } - if (!category.getParent().equals(this)||checkForCircularDependencies(category)){ + if (checkForCircularDependencies(category)){ return false; } return this.children.add(category); Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Course.java 2009-03-24 13:52:47 UTC (rev 98) @@ -55,14 +55,6 @@ setId(id); } - public Course(Long id, List<Category> categories, Course parent, List<Role> roles, List<Course> workgroups){ - setId(id); - this.categories = categories; - this.parent = parent; - this.roles = roles; - this.workgroups = workgroups; - } - /** * Convenience method to add this course to a category. * Updates category list of course object and course list of category object. Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/EntityContainer.java 2009-03-24 13:52:47 UTC (rev 98) @@ -1,5 +1,6 @@ package de.campussource.cse.cdmm.domain; +import java.util.ArrayList; import java.util.List; import javax.xml.bind.annotation.XmlElement; @@ -52,6 +53,12 @@ @Override public String toString() { + if (courses==null){ + courses = new ArrayList<Course>(); + } + if (accounts == null){ + accounts = new ArrayList<Account>(); + } return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE).append(rootCategory).append(courses.toArray()).append(accounts.toArray()).toString(); } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Group.java 2009-03-24 13:52:47 UTC (rev 98) @@ -35,11 +35,6 @@ public Group(Long id){ setId(id); } - - public Group(Long id, List<Account> members){ - setId(id); - this.members = members; - } public boolean equals(Object obj) { if (this == obj) { Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Role.java 2009-03-24 13:52:47 UTC (rev 98) @@ -12,6 +12,8 @@ import javax.persistence.InheritanceType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; import javax.persistence.Table; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlIDREF; @@ -24,6 +26,10 @@ @Entity(name=Constants.ROLE) @Table(name = Constants.TABLENAME_ROLE) @Inheritance(strategy=InheritanceType.JOINED) +@NamedQueries(value = { + @NamedQuery( + name = "Role.findByAccountAndCourse", + query = "select r from role r where r.account.id=:accountId and r.course.id = :courseId")}) @XmlRootElement(namespace=Constants.NAMESPACE_DATATYPES) @XmlType(propOrder={Constants.TYPE, Constants.ACCOUNT, Constants.COURSE}, namespace=Constants.NAMESPACE_DATATYPES) public class Role extends de.campussource.cse.cdmm.domain.Entity{ @@ -40,16 +46,11 @@ @JoinColumn(name=Constants.COLUMNNAME_COURSE_ID, nullable=false) private Course course; + public static final String FIND_BY_ACCOUNT_AND_COURSE = "Role.findByAccountAndCourse"; + public Role(){ } - public Role(Long id, RoleType type, Account account, Course course ){ - setId(id); - this.type = type; - this.account = account; - this.course = course; - } - /** * Convenience method to add role to a course and an account. * Role is added to roles list of course and account object, and Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -3,6 +3,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; import org.junit.Before; import org.junit.Test; @@ -25,7 +26,11 @@ @Test public void testPersistAccount() { - dao.persist(account); + try { + dao.persist(account); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } assertNotNull(account.getId()); txCommit(); } @@ -33,26 +38,54 @@ @Test public void testFindAccount() { - dao.persist(account); - assertNotNull(account.getId()); + try { + dao.persist(account); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } assertNotNull(account.getId()); commitAndBeginTx(); - Account acid = dao.find(account.getId()); + Account acid = null; + try { + acid = dao.find(account.getId()); + } catch (DataModelManagerException e) { + fail("Created account could not be found"); + } assertEquals(account, acid); } @Test public void testRemoveAccount() { - dao.persist(account); - assertNotNull(account.getId()); + try { + dao.persist(account); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } assertNotNull(account.getId()); commitAndBeginTx(); - dao.remove(account); + try { + dao.remove(account); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelMaangerException"); + } commitAndBeginTx(); - assertNull(dao.find(account.getId())); + try { + @SuppressWarnings("unused") + Account retrievedAccount = dao.find(account.getId()); + fail("Deleting of account failed"); + } catch (DataModelManagerException e) { + // Exception should occur; + } + } @Test public void testDoNotFindById() { - Account foundAccount = dao.find(0L); + Account foundAccount = null; + try { + foundAccount = dao.find(0L); + fail("Exception should occur"); + } catch (DataModelManagerException e) { + //Exception should occur + } assertNull(foundAccount); } Added: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CSEMessageTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CSEMessageTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CSEMessageTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,57 @@ +package de.campussource.cse.cdmm; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + +import de.campussource.cse.cdmm.domain.Account; +import de.campussource.cse.cdmm.domain.Entity; + + +import junit.framework.TestCase; + +/** + * Test CSEMessage class + * trivial atm, but may be important if CSEMessage gets more complex + * @author Sebastian Roekens + * + */ +public class CSEMessageTest extends TestCase{ + + @Test + public void testCSEMessage(){ + CSEMessage csem = new CSEMessageImpl(); + + csem.setSuccess(true); + assertTrue(csem.isSuccess()); + + List<Entity> entities = new ArrayList<Entity>(); + Account acc1 = new Account(1L); + Account acc2 = new Account(2L); + Account acc3 = new Account(3L); + entities.add(acc1); + entities.add(acc2); + + csem.setEntities(entities); + assertEquals(2, csem.getEntities().size()); + assertTrue(csem.getEntities().contains(acc1)); + assertTrue(csem.getEntities().contains(acc2)); + + + csem.addEntity(acc3); + assertEquals(3, csem.getEntities().size()); + assertTrue(csem.getEntities().contains(acc3)); + + csem.setEntities(null); + csem.addEntity(acc1); + assertEquals(1, csem.getEntities().size()); + assertTrue(csem.getEntities().contains(acc1)); + + + } + + + + +} \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -5,6 +5,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import org.junit.After; import org.junit.Before; @@ -43,7 +44,11 @@ */ @Test public void testPersistCategory() { - dao.persist(category); + try { + dao.persist(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException on creation of category"); + } assertNotNull(category.getId()); } @@ -53,9 +58,17 @@ */ @Test public void testFindCategory() { - dao.persist(category); - assertNotNull(category.getId()); - Category coid = dao.find(category.getId()); + try { + dao.persist(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException on creation of category"); + } assertNotNull(category.getId()); + Category coid = null; + try { + coid = dao.find(category.getId()); + } catch (DataModelManagerException e) { + fail("Created category could not be retrieved"); + } assertEquals(category, coid); } @@ -64,10 +77,23 @@ */ @Test public void testRemoveCategory() { - dao.persist(category); - assertNotNull(category.getId()); - dao.remove(category); - assertNull(dao.find(category.getId())); + try { + dao.persist(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException on creation of category"); + } assertNotNull(category.getId()); + try { + dao.remove(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } + try { + @SuppressWarnings("unused") + Category retrievedCategory = dao.find(category.getId()); + fail("Deleting of category failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } } /** @@ -76,14 +102,33 @@ @Test public void testCascading(){ category.addToParentCategory(parentCategory); - dao.persist(category); - assertNotNull(category.getId()); + try { + dao.persist(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException on creation of category"); + } assertNotNull(category.getId()); assertNotNull(parentCategory.getId()); assertEquals(category.getParent(), parentCategory); assertEquals(parentCategory.getChildren().get(0), category); - dao.remove(parentCategory); - assertNull(dao.find(parentCategory.getId())); - assertNull(dao.find(category.getId())); + try { + dao.remove(parentCategory); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } + try { + @SuppressWarnings("unused") + Category retrievedParentCategory = dao.find(parentCategory.getId()); + fail("Deleting of parent category failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } + try { + @SuppressWarnings("unused") + Category retrievedCategory = dao.find(category.getId()); + fail("Cascaded deleting of child category failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } } /** @@ -91,7 +136,13 @@ */ @Test public void testDoNotFindById() { - Category foundCategory = dao.find(0L); + Category foundCategory = null; + try { + foundCategory = dao.find(0L); + fail("Exception should occur"); + } catch (DataModelManagerException e) { + // Exception should occur + } assertNull(foundCategory); } @@ -101,7 +152,11 @@ @Test public void testCircularDependencyCheck(){ assertTrue(category.addToParentCategory(parentCategory)); - dao.persist(category); + try { + dao.persist(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException on creation of category"); + } assertFalse(parentCategory.addToParentCategory(category)); } Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -4,6 +4,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; import org.junit.After; import org.junit.Before; @@ -41,7 +42,11 @@ */ @Test public void testPersistCourse() { - dao.persist(course); + try { + dao.persist(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException!"); + } assertNotNull(course.getId()); } @@ -51,10 +56,19 @@ */ @Test public void testFindCourse() { - dao.persist(course); + try { + dao.persist(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException!"); + } assertNotNull(course.getId()); commitAndBeginTx(); - Course coid = dao.find(course.getId()); + Course coid = null; + try { + coid = dao.find(course.getId()); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of course failed!"); + } assertEquals(course, coid); } @@ -63,10 +77,24 @@ */ @Test public void testRemoveCourse() { - dao.persist(course); + try { + dao.persist(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException!"); + } assertNotNull(course.getId()); - dao.remove(course); - assertNull(dao.find(course.getId())); + try { + dao.remove(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException!"); + } + try { + @SuppressWarnings("unused") + Course retrievedCourse = dao.find(course.getId()); + fail("Deleting of course failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } } /** @@ -74,7 +102,13 @@ */ @Test public void testDoNotFindById() { - Course foundCourse = dao.find(0L); + Course foundCourse = null; + try { + foundCourse = dao.find(0L); + fail("Exception should occur"); + } catch (DataModelManagerException e) { + //Exception should occur + } assertNull(foundCourse); } @@ -86,10 +120,18 @@ Category category = new Category(); CategoryDao categoryDao = new CategoryDao(); autowireByType(categoryDao); - categoryDao.persist(category); + try { + categoryDao.persist(category); + } catch (DataModelManagerException e1) { + fail("Unexpected DataModelManagerException"); + } assertNotNull(category.getId()); course.addToCategory(category); - dao.persist(course); + try { + dao.persist(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException!"); + } assertNotNull(course.getId()); assertNotNull(course.getCategories()); assertNotNull(category.getCourses()); @@ -106,7 +148,11 @@ Course workgroup1 = new Course(); Course workgroup2 = new Course(); workgroup1.addAsWorkgroupTo(course); - dao.persist(workgroup1); + try { + dao.persist(workgroup1); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } assertNotNull(workgroup1.getId()); assertNotNull(course.getId()); assertNotNull(workgroup1.getParent()); @@ -116,9 +162,25 @@ //check if circular dependency is prevented assertFalse(workgroup2.addAsWorkgroupTo(workgroup1)); //check correct deleting cascading - dao.remove(course); - assertNull(dao.find(course.getId())); - assertNull(dao.find(workgroup1.getId())); + try { + dao.remove(course); + } catch (DataModelManagerException e) { + fail("Unexpected Exception on removing of course"); + } + try { + @SuppressWarnings("unused") + Course retrievedCourse = dao.find(course.getId()); + fail("Deleting of course failed"); + } catch (DataModelManagerException e) { + //Exception should occur + } + try { + @SuppressWarnings("unused") + Course retrievedWorkgroup = dao.find(workgroup1.getId()); + fail("Cascaded deleting of workgroup failed"); + } catch (DataModelManagerException e) { + //Exception should occur + } } Added: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,31 @@ +package de.campussource.cse.cdmm; + +import static org.junit.Assert.fail; + +import org.junit.Before; +import org.junit.Test; + +import de.campussource.cse.cdmm.dao.AccountDao; +import de.campussource.cse.cdmm.domain.Entity; +import de.campussource.cse.common.test.AbstractPersistentUnitTest; + +public class DaoTest extends AbstractPersistentUnitTest { + private AccountDao accountDao; + + @Before + public void setUp() { + accountDao = new AccountDao(); + autowireByType(accountDao); + txBegin(); + } + + @Test + public void testAccountDao(){ + try { + accountDao.remove(null); + fail("Exception should occur"); + } catch (DataModelManagerException e) { + } + } + +} Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-23 14:03:06 UTC (rev 97) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -4,6 +4,12 @@ import java.util.List; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import javax.persistence.NoResultException; +import javax.persistence.Query; + +import org.apache.commons.lang.Validate; import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; @@ -13,6 +19,7 @@ import de.campussource.cse.cdmm.domain.Course; import de.campussource.cse.cdmm.domain.Entity; import de.campussource.cse.cdmm.domain.Group; +import de.campussource.cse.cdmm.domain.Role; import de.campussource.cse.common.test.AbstractPersistentUnitTest; public class DataModelManagerBeanTest extends AbstractPersistentUnitTest { @@ -29,55 +36,124 @@ @Test public void testCategoryOperations(){ Long categoryId = uniqueId(); - assertEquals(0, dmm.retrieveCategory(categoryId).getEntities().size()); + CSEMessage csem = null; + try { + csem = dmm.retrieveCategory(categoryId); + fail("DataModelManagerException expected"); + } catch (DataModelManagerException e) { + // Exception should occur + } + assertNull(csem); Category category = new Category(categoryId); - dmm.saveCategory(category); - assertNotNull(dmm.retrieveCategory(categoryId)); - CSEMessage csem = dmm.retrieveCategory(categoryId); + try { + dmm.saveCategory(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException Exception"); + } + try { + csem = dmm.retrieveCategory(categoryId); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of category failed"); + } + assertNotNull(csem); assertNotNull(csem.getEntities()); for (Entity entity : csem.getEntities()){ assertTrue(entity instanceof Category); } Category retrievedCategory = (Category) csem.getEntities().get(0); assertEquals(category, retrievedCategory); - dmm.deleteCategory(category); - assertEquals(0, dmm.retrieveCategory(categoryId).getEntities().size()); + try { + dmm.deleteCategory(category); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException Exception"); + } + try { + csem = dmm.retrieveCategory(categoryId); + fail("DataModelManagerException should have occured"); + } catch (DataModelManagerException e) { + // Exception should occur + } } @Test public void testCourseOperations(){ Long courseId = uniqueId(); - assertEquals(0, dmm.retrieveCourse(courseId).getEntities().size()); + CSEMessage csem = null; + try { + csem = dmm.retrieveCourse(courseId); + fail("DataModelManager Exception should occur"); + } catch (DataModelManagerException e) { + // Exception should occur + } Course course = new Course(courseId); - dmm.saveCourse(course); - assertNotNull(dmm.retrieveCourse(courseId)); - CSEMessage csem = dmm.retrieveCourse(courseId); + try { + dmm.saveCourse(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManagerException"); + } + try { + csem = dmm.retrieveCourse(courseId); + } catch (DataModelManagerException e) { + fail("Creation or retrieving of course failed"); + } + assertNotNull(csem); assertNotNull(csem.getEntities()); for (Entity entity : csem.getEntities()){ assertTrue(entity instanceof Course); } Course retrievedCourse = (Course) csem.getEntities().get(0); assertEquals(course, retrievedCourse); - dmm.deleteCourse(course); - assertEquals(0, dmm.retrieveCourse(courseId).getEntities().size()); + try { + dmm.deleteCourse(course); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + try { + csem = dmm.retrieveCourse(courseId); + fail("Deleting of course failed"); + } catch (DataModelManagerException e) { + //Exception should occur + } } @Test public void testAccountOperations(){ Long accountId = uniqueId(); - assertEquals(0, dmm.retrieveAccount(accountId).getEntities().size()); + CSEMessage csem = null; + try { + csem = dmm.retrieveAccount(accountId); + fail("Not Existing object found"); + } catch (DataModelManagerException e) { + // Exception should occur + } Account account = new Account(accountId); - dmm.saveAccount(account); - assertNotNull(dmm.retrieveAccount(accountId)); - CSEMessage csem = dmm.retrieveAccount(accountId); + try { + dmm.saveAccount(account); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + try { + csem = dmm.retrieveAccount(accountId); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of account object failed"); + } assertNotNull(csem.getEntities()); for (Entity entity : csem.getEntities()){ assertTrue(entity instanceof Account); } Account retrievedAccount = (Account) csem.getEntities().get(0); assertEquals(account, retrievedAccount); - dmm.deleteAccount(account); - assertEquals(0, dmm.retrieveAccount(accountId).getEntities().size()); + try { + dmm.deleteAccount(account); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + try { + csem = dmm.retrieveAccount(accountId); + fail("Deleting of account failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } } @Test @@ -88,17 +164,46 @@ Account account1 = new Account(account1Id); Account account2 = new Account(account2Id); Group group = new Group(groupId); - dmm.saveAccount(account1); - dmm.saveAccount(account2); - assertEquals(1, dmm.retrieveAccount(account1Id).getEntities().size()); - assertEquals(1, dmm.retrieveAccount(account2Id).getEntities().size()); + try { + dmm.saveAccount(account1); + dmm.saveAccount(account2); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + CSEMessage csem = null; + try { + csem = dmm.retrieveAccount(account1Id); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of account failed"); + } + assertNotNull(csem); + assertEquals(1, csem.getEntities().size()); + + csem = null; + try { + csem = dmm.retrieveAccount(account2Id); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of account failed"); + } + assertNotNull(csem); + assertEquals(1, csem.getEntities().size()); account1.addToGroup(group); account2.addToGroup(group); - dmm.saveGroup(group); + try { + dmm.saveGroup(group); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + csem = null; - CSEMessage csem = dmm.retrieveGroup(groupId); + try { + csem = dmm.retrieveGroup(groupId); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of group failed"); + } + assertNotNull(csem); assertEquals(1, csem.getEntities().size()); Group retrievedGroup = (Group) csem.getEntities().get(0); @@ -109,19 +214,108 @@ assertTrue(members.contains(account1)); assertTrue(members.contains(account2)); - dmm.deleteAccount(account1); - retrievedGroup = (Group) dmm.retrieveGroup(groupId).getEntities().get(0); + try { + dmm.deleteAccount(account1); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + csem = null; + try { + csem = dmm.retrieveGroup(groupId); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + assertNotNull(csem); + assertEquals(1, csem.getEntities().size()); + retrievedGroup = (Group) csem.getEntities().get(0); assertEquals(1, retrievedGroup.getMembers().size()); - dmm.deleteGroup(retrievedGroup); - assertEquals(0, dmm.retrieveGroup(groupId).getEntities().size()); - assertNotNull(dmm.retrieveAccount(account2Id).getEntities()); - assertEquals(1, dmm.retrieveAccount(account2Id).getEntities().size()); - Account retrievedAccount2 = (Account) dmm.retrieveAccount(account2Id).getEntities().get(0); + try { + dmm.deleteGroup(retrievedGroup); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + csem = null; + try { + csem = dmm.retrieveGroup(groupId); + fail("Deleting of group failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } + csem = null; + try { + csem = dmm.retrieveAccount(account2Id); + } catch (DataModelManagerException e) { + fail("Account shouldn't be deleted"); + } + assertNotNull(csem); + assertEquals(1, csem.getEntities().size()); + Account retrievedAccount2 = (Account) csem.getEntities().get(0); List<Group> groups = retrievedAccount2.getGroups(); if (groups != null && groups.size()!=0){ fail("Group list should have been empty!"); } } - + + @Test + public void testRoleOperations(){ + long roleId = uniqueId(); + CSEMessage csem = null; + try { + csem = dmm.retrieveRole(roleId); + fail("Exception should occur"); + } catch (DataModelManagerException e) { + // Exception should occur + } + assertNull(csem); + Role role = new Role(roleId); + try { + dmm.saveRole(role); + fail("Creating of role without account and course reference should be impossible"); + } catch (DataModelManagerException e) { + //Exception should occur; + } + Account account = new Account (uniqueId()); + Course course = new Course (uniqueId()); + try{ + dmm.saveAccount(account); + dmm.saveCourse(course); + } catch (DataModelManagerException e){ + fail("Unexpected DataModelManager Exception"); + } + role.addToCourseAndAccount(course, account); + try { + dmm.saveRole(role); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + csem = null; + try { + csem = dmm.retrieveRole(roleId); + } catch (DataModelManagerException e) { + fail("Creating or retrieving of role failed"); + } + assertNotNull(csem); + assertEquals(1, csem.getEntities().size()); + assertEquals(role, csem.getEntities().get(0)); + + try { + dmm.deleteRole(role); + } catch (DataModelManagerException e) { + fail("Unexpected DataModelManager Exception"); + } + csem = null; + try { + csem = dmm.retrieveRole(roleId); + fail("Deleting of role failed"); + } catch (DataModelManagerException e) { + // Exception should occur + } + } + + @Test + public void testRoleQueries(){ + + } + } \ No newline at end of file Added: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerExceptionTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,39 @@ +package de.campussource.cse.cdmm; + +import static org.junit.Assert.*; + +import org.junit.Test; + +/** + * @author Sebastian Roekens + */ +public class DataModelManagerExceptionTest { + + @Test + public void testDefaultConstructor() { + Exception e = new IdNotFoundException(); + assertNotNull(e); + } + + @Test + public void testMessageConstructor() { + Exception e = new DataModelManagerException("message"); + assertEquals("message", e.getMessage()); + } + + @Test + public void testCauseConstructor() { + Exception e = new DataModelManagerException("message"); + Exception e2 = new DataModelManagerException(e); + assertEquals(e,e2.getCause()); + } + + @Test + public void testMessageCauseConstructor() { + Exception e = new DataModelManagerException("message"); + Exception e2 = new DataModelManagerException("message", e); + assertEquals(e, e2.getCause()); + assertEquals("message", e2.getMessage()); + } + +} \ No newline at end of file Added: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DomainTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,125 @@ +package de.campussource.cse.cdmm; + +import java.util.ArrayList; +import java.util.List; + +import org.junit.Test; + +import de.campussource.cse.cdmm.domain.Account; +import de.campussource.cse.cdmm.domain.Attribute; +import de.campussource.cse.cdmm.domain.Category; +import de.campussource.cse.cdmm.domain.Course; +import de.campussource.cse.cdmm.domain.Entity; +import de.campussource.cse.cdmm.domain.EntityContainer; +import de.campussource.cse.cdmm.domain.Group; +import de.campussource.cse.cdmm.domain.PersistentAttribute; +import de.campussource.cse.cdmm.domain.Role; +import de.campussource.cse.cdmm.domain.RoleType; +import de.campussource.cse.cdmm.domain.TransientAttribute; + +import junit.framework.TestCase; + +/** + * Tests to cover code of entity classes not handled in dao tests + * @author Sebastian Roekens + * + */ +public class DomainTest extends TestCase{ + + @Test + public void testAccountEntity(){ + Account account = new Account(); + Group group = new Group(); + + //test isInGroup method + assertFalse(account.isInGroup(group)); + assertFalse(account.isInGroup(null)); + group.setMembers(new ArrayList<Account>()); + assertFalse(account.isInGroup(group)); + + //test removeFromGroupMethod and addToGroup + assertFalse(account.removeFromGroup(null)); + assertFalse(account.removeFromGroup(group)); + assertFalse(account.addToGroup(null)); + List<Account> members = group.getMembers(); + members.add(account); + group.setMembers(members); + assertFalse(account.addToGroup(group)); + account = new Account(1l); + group = new Group(); + assertTrue(account.addToGroup(group)); + assertFalse(account.addToGroup(group)); + } + + @Test + public void testCourseEntity(){ + Course course = new Course(); + Category category = new Category(); + assertFalse(course.addToCategory(null)); + assertTrue(course.addToCategory(category)); + + course = new Course(); + category = new Category(); + List<Category> categories = new ArrayList<Category>(); + categories.add(category); + course.addToCagetories(categories); + + assertFalse(course.addAsWorkgroupTo(null)); + Course parentCourse = new Course(); + assertTrue(course.addAsWorkgroupTo(parentCourse)); + Course childCourse = new Course(); + assertFalse(childCourse.addAsWorkgroupTo(course)); + } + + @Test + public void testEntityEntity(){ + Entity entity = new Entity(); + assertFalse(entity.equals(null)); + assertNotNull(entity.hashCode()); + entity = new Entity(1L); + Attribute att1 = new Attribute(); + att1.setPersistent(true); + Attribute att2 = new Attribute(); + att2.setPersistent(false); + List<Attribute> attribs = new ArrayList<Attribute>(); + attribs.add(att1); attribs.add(att2); + entity.setAttributes(attribs); + } + + @Test + public void testEntityContainerEntity(){ + EntityContainer container = new EntityContainer(); + assertNotNull(container.toString()); + assertNotNull(container.toString()); + } + + @Test + public void testGroupEntity(){ + Group group1 = new Group(); + Group group2 = new Group(); + assertFalse(group1.equals(null)); + assertFalse(group1.equals(group2)); + assertNotNull(group1.hashCode()); + } + + @Test + public void testPersistentAttribute(){ + PersistentAttribute persatt = new PersistentAttribute(); + assertNull(persatt.getEntity()); + TransientAttribute transatt = new TransientAttribute(); + assertFalse(persatt.equals(transatt)); + } + + @Test + public void testRoleEntity(){ + Role role = new Role(1l, RoleType.UNDEFINED); + Account account = new Account(); + Course course = new Course(); + assertFalse(role.addToCourseAndAccount(null, account)); + assertFalse(role.addToCourseAndAccount(course, null)); + assertTrue(role.addToCourseAndAccount(course, account)); + } + + + +} \ No newline at end of file Added: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/IdNotFoundExceptionTest.java 2009-03-24 13:52:47 UTC (rev 98) @@ -0,0 +1,39 @@ +package de.campussource.cse.cdmm; + +import static org.junit.Assert.*; + +import org.junit.Test; + +/** + * @author Sebastian Roekens + */ +public class IdNotFoundExceptionTest { + + @Test + public void testDefaultConstructor() { + DataModelManagerException dmme = new IdNotFoundException(); + assertNotNull(dmme); + } + + @Test + public void testMessageConstructor() { + DataModelManagerException dmme = new IdNotFoundException("message"); + assertEquals("message", dmme.getMessage()); + } + + @Test + public void testCauseConstructor() { + DataModelManagerException dmme = new IdNotFoun... [truncated message content] |
From: <ro...@us...> - 2009-03-23 14:03:16
|
Revision: 97 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=97&view=rev Author: roekens Date: 2009-03-23 14:03:06 +0000 (Mon, 23 Mar 2009) Log Message: ----------- - implementation of service bean dmm - integration of new tests - bugfixing IN PROGRESS Modified Paths: -------------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessage.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java Added Paths: ----------- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessageImpl.java Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessage.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessage.java 2009-03-18 08:55:19 UTC (rev 96) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessage.java 2009-03-23 14:03:06 UTC (rev 97) @@ -1,5 +1,39 @@ package de.campussource.cse.cdmm; +import java.util.ArrayList; +import java.util.List; + +import de.campussource.cse.cdmm.domain.Entity; + public abstract class CSEMessage{ + private List<Entity> entities; + + private boolean successful; + + public boolean isSuccess() { + return successful; + } + + public void setSuccess(boolean success) { + this.successful = success; + } + + public List<Entity> getEntities() { + return entities; + } + + public void setEntities(List<Entity> entities) { + this.entities = entities; + } + + public void addEntity(Entity entity){ + if (entities == null){ + entities = new ArrayList<Entity>(); + } + if (entity != null){ + entities.add(entity); + } + } + } \ No newline at end of file Added: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessageImpl.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessageImpl.java (rev 0) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/CSEMessageImpl.java 2009-03-23 14:03:06 UTC (rev 97) @@ -0,0 +1,5 @@ +package de.campussource.cse.cdmm; + +public class CSEMessageImpl extends CSEMessage{ + +} \ No newline at end of file Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-18 08:55:19 UTC (rev 96) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-23 14:03:06 UTC (rev 97) @@ -1,5 +1,8 @@ package de.campussource.cse.cdmm; +import java.util.ArrayList; +import java.util.List; + import javax.ejb.EJB; import javax.ejb.Stateless; @@ -33,6 +36,14 @@ @Override public CSEMessage deleteAccount(Account account) { + if (account.getGroups()!=null && account.getGroups().size()!=0){ + for (Group group : account.getGroups()){ + List<Account> members = group.getMembers(); + members.remove(account); + group.setMembers(members); + groupDao.persist(group); + } + } accountDao.remove(account); return null; } @@ -51,6 +62,11 @@ @Override public CSEMessage deleteGroup(Group group) { + while (group.getMembers()!=null && group.getMembers().size()!=0){ + Account account = group.getMembers().get(0); + account.removeFromGroup(group); + groupDao.persist(group); + } groupDao.remove(group); return null; } @@ -64,45 +80,59 @@ @Override public CSEMessage retrieveAccount(long accountId) { Account account = accountDao.find(accountId); - return null; + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(account); + return csem; } @Override public CSEMessage retrieveCategory(long categoryId) { Category category = categoryDao.find(categoryId); + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(category); //TODO cut subcategories or define new method in dao - return null; + return csem; } @Override public CSEMessage retrieveCategoryHierarchy(long categoryId) { Category category = categoryDao.find(categoryId); - return null; + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(category); + return csem; } @Override public CSEMessage retrieveCourse(long courseId) { //TODO cut workgroups or define new method in dao Course course = courseDao.find(courseId); - return null; + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(course); + return csem; } @Override public CSEMessage retrieveCourseHierarchy(long courseId) { Course course = courseDao.find(courseId); - return null; + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(course); + return csem; } @Override public CSEMessage retrieveGroup(long groupId) { Group group = groupDao.find(groupId); - return null; + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(group); + return csem; } @Override public CSEMessage retrieveRole(long roleId) { Role role = roleDao.find(roleId); - return null; + CSEMessage csem = new CSEMessageImpl(); + csem.addEntity(role); + return csem; } @Override Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-18 08:55:19 UTC (rev 96) +++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Account.java 2009-03-23 14:03:06 UTC (rev 97) @@ -58,7 +58,7 @@ if (groups==null){ groups = new ArrayList<Group>(); } - if (groups.contains(group)||group.getMembers().contains(this)){ + if (groups.contains(group)||(group.getMembers()!=null && group.getMembers().contains(this))){ return false; } groups.add(group); Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-18 08:55:19 UTC (rev 96) +++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-23 14:03:06 UTC (rev 97) @@ -2,10 +2,17 @@ +import java.util.List; + import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.*; +import de.campussource.cse.cdmm.domain.Account; import de.campussource.cse.cdmm.domain.Category; +import de.campussource.cse.cdmm.domain.Course; +import de.campussource.cse.cdmm.domain.Entity; +import de.campussource.cse.cdmm.domain.Group; import de.campussource.cse.common.test.AbstractPersistentUnitTest; public class DataModelManagerBeanTest extends AbstractPersistentUnitTest { @@ -20,9 +27,101 @@ } @Test - public void testSaveCategory(){ - Category category = new Category(uniqueId()); + public void testCategoryOperations(){ + Long categoryId = uniqueId(); + assertEquals(0, dmm.retrieveCategory(categoryId).getEntities().size()); + Category category = new Category(categoryId); dmm.saveCategory(category); + assertNotNull(dmm.retrieveCategory(categoryId)); + CSEMessage csem = dmm.retrieveCategory(categoryId); + assertNotNull(csem.getEntities()); + for (Entity entity : csem.getEntities()){ + assertTrue(entity instanceof Category); + } + Category retrievedCategory = (Category) csem.getEntities().get(0); + assertEquals(category, retrievedCategory); + dmm.deleteCategory(category); + assertEquals(0, dmm.retrieveCategory(categoryId).getEntities().size()); } + + @Test + public void testCourseOperations(){ + Long courseId = uniqueId(); + assertEquals(0, dmm.retrieveCourse(courseId).getEntities().size()); + Course course = new Course(courseId); + dmm.saveCourse(course); + assertNotNull(dmm.retrieveCourse(courseId)); + CSEMessage csem = dmm.retrieveCourse(courseId); + assertNotNull(csem.getEntities()); + for (Entity entity : csem.getEntities()){ + assertTrue(entity instanceof Course); + } + Course retrievedCourse = (Course) csem.getEntities().get(0); + assertEquals(course, retrievedCourse); + dmm.deleteCourse(course); + assertEquals(0, dmm.retrieveCourse(courseId).getEntities().size()); + } + + @Test + public void testAccountOperations(){ + Long accountId = uniqueId(); + assertEquals(0, dmm.retrieveAccount(accountId).getEntities().size()); + Account account = new Account(accountId); + dmm.saveAccount(account); + assertNotNull(dmm.retrieveAccount(accountId)); + CSEMessage csem = dmm.retrieveAccount(accountId); + assertNotNull(csem.getEntities()); + for (Entity entity : csem.getEntities()){ + assertTrue(entity instanceof Account); + } + Account retrievedAccount = (Account) csem.getEntities().get(0); + assertEquals(account, retrievedAccount); + dmm.deleteAccount(account); + assertEquals(0, dmm.retrieveAccount(accountId).getEntities().size()); + } + + @Test + public void testGroupOperations(){ + Long groupId = uniqueId(); + Long account1Id = uniqueId(); + Long account2Id = uniqueId(); + Account account1 = new Account(account1Id); + Account account2 = new Account(account2Id); + Group group = new Group(groupId); + dmm.saveAccount(account1); + dmm.saveAccount(account2); + assertEquals(1, dmm.retrieveAccount(account1Id).getEntities().size()); + assertEquals(1, dmm.retrieveAccount(account2Id).getEntities().size()); + + account1.addToGroup(group); + account2.addToGroup(group); + + dmm.saveGroup(group); + + CSEMessage csem = dmm.retrieveGroup(groupId); + assertEquals(1, csem.getEntities().size()); + + Group retrievedGroup = (Group) csem.getEntities().get(0); + assertEquals(group, retrievedGroup); + + List<Account> members = retrievedGroup.getMembers(); + assertEquals(2, retrievedGroup.getMembers().size()); + assertTrue(members.contains(account1)); + assertTrue(members.contains(account2)); + + dmm.deleteAccount(account1); + retrievedGroup = (Group) dmm.retrieveGroup(groupId).getEntities().get(0); + assertEquals(1, retrievedGroup.getMembers().size()); + dmm.deleteGroup(retrievedGroup); + assertEquals(0, dmm.retrieveGroup(groupId).getEntities().size()); + assertNotNull(dmm.retrieveAccount(account2Id).getEntities()); + assertEquals(1, dmm.retrieveAccount(account2Id).getEntities().size()); + Account retrievedAccount2 = (Account) dmm.retrieveAccount(account2Id).getEntities().get(0); + List<Group> groups = retrievedAccount2.getGroups(); + if (groups != null && groups.size()!=0){ + fail("Group list should have been empty!"); + } + } + } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-18 08:55:20
|
Revision: 96 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=96&view=rev Author: idueppe Date: 2009-03-18 08:55:19 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Add unit test to archive 100 % code coverage and add a persistence.xml for deployment. Modified Paths: -------------- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml Added Paths: ----------- trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/ trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java Modified: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java 2009-03-18 08:54:12 UTC (rev 95) +++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java 2009-03-18 08:55:19 UTC (rev 96) @@ -16,6 +16,9 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +/** + * @author Ingo Dueppe + */ @Entity(name="MappedClientObject") @Table(name = "MAPPED_CLIENT_OBJECT", uniqueConstraints = @UniqueConstraint(columnNames = { "CLIENT_OBJECT_ID", "CLIENT_INSTANCE_ID" })) @@ -83,15 +86,13 @@ } if (!(obj instanceof MappedClientObject)) { return false; - } else { - MappedClientObject other = (MappedClientObject) obj; - return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId) - .append(clientObjectId, other.clientObjectId).isEquals(); - } + } + MappedClientObject other = (MappedClientObject) obj; + return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId).isEquals(); } public int hashCode() { - return new HashCodeBuilder().append(busId).append(clientInstanceId).append(clientObjectId).toHashCode(); + return new HashCodeBuilder().append(busId).append(clientInstanceId).toHashCode(); } public String toString() { Modified: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java 2009-03-18 08:54:12 UTC (rev 95) +++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java 2009-03-18 08:55:19 UTC (rev 96) @@ -13,12 +13,18 @@ public class MappedClientObjectPK implements Serializable { private static final long serialVersionUID = 4835950977456597594L; - + private Long busId; private Long clientInstanceId; - - public MappedClientObjectPK() {} + public MappedClientObjectPK() { + } + + public MappedClientObjectPK(Long busId, Long clientInstanceId) { + this.busId = busId; + this.clientInstanceId = clientInstanceId; + } + public Long getBusId() { return busId; } @@ -41,11 +47,9 @@ } if (!(obj instanceof MappedClientObjectPK)) { return false; - } else { - MappedClientObjectPK other = (MappedClientObjectPK) obj; - return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId) - .isEquals(); } + MappedClientObjectPK other = (MappedClientObjectPK) obj; + return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId).isEquals(); } public int hashCode() { @@ -56,5 +60,4 @@ return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(busId).append(clientInstanceId).toString(); } - } Added: trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml (rev 0) +++ trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml 2009-03-18 08:55:19 UTC (rev 96) @@ -0,0 +1,21 @@ +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="cs-idmapper" transaction-type="RESOURCE_LOCAL"> + <provider>oracle.toplink.essentials.PersistenceProvider</provider> + <class>de.campussource.cse.mapper.MappedClientObject</class> + <properties> + <property name="toplink.ddl-generation" value="drop-and-create-tables" /> + <property name="toplink.jdbc.driver" value="com.mysql.jdbc.Driver" /> + <property name="toplink.jdbc.url" value="jdbc:mysql://localhost:3306/cseip?createDatabaseIfNotExist=true" /> + <property name="toplink.jdbc.user" value="root" /> + <property name="toplink.jdbc.password" value="masterkey" /> + </properties> + </persistence-unit> +</persistence> + + + + + \ No newline at end of file Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java 2009-03-18 08:55:19 UTC (rev 96) @@ -0,0 +1,39 @@ +package de.campussource.cse.mapper; + +import static org.junit.Assert.*; + +import org.junit.Test; + +/** + * @author Ingo Dueppe + */ +public class IdNotFoundExceptionTest { + + @Test + public void testDefaultConstructor() { + MapperException me = new IdNotFoundException(); + assertNotNull(me); + } + + @Test + public void testMessageConstructor() { + MapperException me = new IdNotFoundException("message"); + assertEquals("message", me.getMessage()); + } + + @Test + public void testCauseConstructor() { + MapperException me = new IdNotFoundException("message"); + MapperException me2 = new IdNotFoundException(me); + assertEquals(me,me2.getCause()); + } + + @Test + public void testMessageCauseConstructor() { + MapperException me = new IdNotFoundException("message"); + MapperException me2 = new IdNotFoundException("message", me); + assertEquals(me, me2.getCause()); + assertEquals("message", me2.getMessage()); + } + +} Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-18 08:54:12 UTC (rev 95) +++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-18 08:55:19 UTC (rev 96) @@ -8,6 +8,9 @@ import de.campussource.cse.common.test.AbstractPersistentUnitTest; +/** + * @author Ingo Dueppe + */ public class IdentityMapperTest extends AbstractPersistentUnitTest { private static final Long UNKNOWN_BUS_ID = -1000L; Added: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java 2009-03-18 08:55:19 UTC (rev 96) @@ -0,0 +1,63 @@ +package de.campussource.cse.mapper; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * @author Ingo Dueppe + */ +public class MappedClientObjectPKTest { + + @Test + public void testEquals() { + MappedClientObjectPK pk = new MappedClientObjectPK(); + assertTrue(pk.equals(pk)); + + assertFalse(new MappedClientObjectPK().equals(new Object())); + assertFalse(new Object().equals(new MappedClientObjectPK())); + + assertFalse(new MappedClientObjectPK(1L, 1L).equals(new MappedClientObjectPK())); + assertFalse(new MappedClientObjectPK().equals(new MappedClientObjectPK(1L, 1L))); + + assertTrue(new MappedClientObjectPK(1L, 1L).equals(new MappedClientObjectPK(1L, 1L))); + + assertFalse(new MappedClientObjectPK(1L, 2L).equals(new MappedClientObjectPK(2L, 1L))); + assertFalse(new MappedClientObjectPK(1L, 1L).equals(new MappedClientObjectPK(1L, 2L))); + + assertTrue(new MappedClientObjectPK(1L, null).equals(new MappedClientObjectPK(1L, null))); + assertFalse(new MappedClientObjectPK(null, null).equals(new MappedClientObjectPK(1L, null))); + + assertTrue(new MappedClientObjectPK().equals(new MappedClientObjectPK())); + } + + @Test + public void testSetters() { + MappedClientObjectPK pk = new MappedClientObjectPK(); + + assertTrue(pk.getBusId() == null); + assertTrue(pk.getClientInstanceId() == null); + + pk.setBusId(1L); + assertEquals((Long)1L, pk.getBusId()); + + pk.setClientInstanceId(1L); + assertEquals((Long)1L, pk.getClientInstanceId()); + } + + @Test + public void testToString() { + assertFalse(new MappedClientObjectPK().toString().isEmpty()); + } + + @Test + public void testHashCode() { + assertEquals(new MappedClientObjectPK(1L,1L).hashCode(), new MappedClientObjectPK(1L,1L).hashCode()); + assertNotSame(new MappedClientObjectPK(1L,1L).hashCode(), new MappedClientObjectPK(1L,2L).hashCode()); + assertNotSame(new MappedClientObjectPK(1L,1L).hashCode(), new MappedClientObjectPK(2L,1L).hashCode()); + } + +} Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java (rev 0) +++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java 2009-03-18 08:55:19 UTC (rev 96) @@ -0,0 +1,54 @@ +package de.campussource.cse.mapper; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +/** + * @author Ingo Dueppe + */ +public class MappedClientObjectTest { + + @Test + public void testEquals() { + MappedClientObject mapped = new MappedClientObject(); + assertTrue(mapped.equals(mapped)); + + assertFalse(new MappedClientObject().equals(new Object())); + assertFalse(new Object().equals(new MappedClientObject())); + + assertFalse(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject())); + assertFalse(new MappedClientObject().equals(new MappedClientObject(1L, 1L, ""))); + + assertTrue(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject(1L, 1L, ""))); + assertTrue(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject(1L, 1L, "XYZ"))); + + assertFalse(new MappedClientObject(1L, 2L, "").equals(new MappedClientObject(2L, 1L, ""))); + assertFalse(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject(1L, 2L, ""))); + + assertTrue(new MappedClientObject(1L, null, "").equals(new MappedClientObject(1L, null, ""))); + assertFalse(new MappedClientObject(null, null, "").equals(new MappedClientObject(1L, null, ""))); + + assertTrue(new MappedClientObject().equals(new MappedClientObject())); + + assertFalse(new MappedClientObject().equals(null)); + } + + @Test + public void testToString() { + assertFalse(new MappedClientObject().toString().isEmpty()); + assertFalse(new MappedClientObject(1L, 1L,"TEST").toString().isEmpty()); + } + + @Test + public void testHashCode() { + assertEquals(new MappedClientObject(1L,1L,"").hashCode(), new MappedClientObject(1L,1L,"").hashCode()); + assertEquals(new MappedClientObject(1L,1L,"321").hashCode(), new MappedClientObject(1L,1L,"123").hashCode()); + assertNotSame(new MappedClientObject(1L,1L,"").hashCode(), new MappedClientObject(1L,2L,"").hashCode()); + assertNotSame(new MappedClientObject(1L,1L,"").hashCode(), new MappedClientObject(2L,1L,"").hashCode()); + } + +} Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-18 08:54:12 UTC (rev 95) +++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-18 08:55:19 UTC (rev 96) @@ -10,6 +10,9 @@ import org.junit.Test; +/** + * @author Ingo Dueppe + */ public class PersistentUnitConfigurationTest { @Test Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml =================================================================== --- trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-18 08:54:12 UTC (rev 95) +++ trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-18 08:55:19 UTC (rev 96) @@ -8,7 +8,7 @@ <properties> <property name="toplink.ddl-generation" value="drop-and-create-tables" /> <property name="toplink.jdbc.driver" value="com.mysql.jdbc.Driver" /> - <property name="toplink.jdbc.url" value="jdbc:mysql://localhost:3306/cseip?createDatabaseIfNotExist=true" /> + <property name="toplink.jdbc.url" value="jdbc:mysql://localhost:3306/cseiptest?createDatabaseIfNotExist=true" /> <property name="toplink.jdbc.user" value="root" /> <property name="toplink.jdbc.password" value="masterkey" /> </properties> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-18 08:54:17
|
Revision: 95 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=95&view=rev Author: idueppe Date: 2009-03-18 08:54:12 +0000 (Wed, 18 Mar 2009) Log Message: ----------- Add license and reports to the pom and fixed the use of different version of toplink.essential between sc-cdmm and sc-idmapper Modified Paths: -------------- trunk/sandbox/cse-ip/pom.xml trunk/sandbox/cse-ip/sc-cdmm/pom.xml Modified: trunk/sandbox/cse-ip/pom.xml =================================================================== --- trunk/sandbox/cse-ip/pom.xml 2009-03-18 07:40:21 UTC (rev 94) +++ trunk/sandbox/cse-ip/pom.xml 2009-03-18 08:54:12 UTC (rev 95) @@ -37,30 +37,38 @@ </developer> </developers> + <licenses> + <license> + <name>GNU General Public License</name> + <url>http://www.gnu.org/copyleft/gpl.html</url> + </license> + </licenses> + <scm> <connection>scm:svn:https://cse-ip.svn.sourceforge.net/svnroot/cse-ip/trunk/cse-ip</connection> <url>https://cse-ip.svn.sourceforge.net/svnroot/cse-ip/trunk/cse-ip</url> </scm> + <organization> <name>CampusSource</name> <url>http://cse.campussource.de</url> </organization> <modules> - <module>framework</module> + <module>framework</module> <module>ica-his-lsf</module> <module>sc-idmapper</module> <module>sc-cdmm</module> <module>cse-ip-application</module> </modules> - + <repositories> <repository> <id>java-net</id> <name>Java.Net</name> <layout>legacy</layout> <url>https://maven-repository.dev.java.net/nonav/repository</url> - </repository> + </repository> </repositories> <build> @@ -123,6 +131,45 @@ </plugins> </build> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <linkXref>true</linkXref> + <targetJdk>1.6</targetJdk> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <configuration> + <tags> + <tag>TODO</tag> + <tag>FIXME</tag> + </tags> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + </plugin> + </plugins> + </reporting> + <dependencyManagement> <dependencies> <dependency> Modified: trunk/sandbox/cse-ip/sc-cdmm/pom.xml =================================================================== --- trunk/sandbox/cse-ip/sc-cdmm/pom.xml 2009-03-18 07:40:21 UTC (rev 94) +++ trunk/sandbox/cse-ip/sc-cdmm/pom.xml 2009-03-18 08:54:12 UTC (rev 95) @@ -73,7 +73,7 @@ <dependency> <groupId>toplink.essentials</groupId> <artifactId>toplink-essentials</artifactId> - <version>2.1-60e</version> + <version>${toplink.version}</version> <scope>test</scope> </dependency> <dependency> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-18 07:40:24
|
Revision: 94 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=94&view=rev Author: idueppe Date: 2009-03-18 07:40:21 +0000 (Wed, 18 Mar 2009) Log Message: ----------- add .classpath to svn:ignore Property Changed: ---------------- trunk/sandbox/cse-ip/framework/test-utilities/ trunk/sandbox/cse-ip/sc-cdmm/ Property changes on: trunk/sandbox/cse-ip/framework/test-utilities ___________________________________________________________________ Added: svn:ignore + .classpath Property changes on: trunk/sandbox/cse-ip/sc-cdmm ___________________________________________________________________ Modified: svn:ignore - createDDL.jdbc dropDDL.jdbc + createDDL.jdbc dropDDL.jdbc .classpath This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-17 15:10:18
|
Revision: 93 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=93&view=rev Author: idueppe Date: 2009-03-17 15:10:09 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Removed Paths: ------------- cse-ip/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-17 15:08:19
|
Revision: 92 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=92&view=rev Author: idueppe Date: 2009-03-17 15:07:14 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Refactoring Added Paths: ----------- trunk/sandbox/cse-ip/ Removed Paths: ------------- cse-ip/trunk/sandbox/cse-ip/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-17 14:57:18
|
Revision: 91 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=91&view=rev Author: idueppe Date: 2009-03-17 14:57:09 +0000 (Tue, 17 Mar 2009) Log Message: ----------- removed generated files. Use mvn eclipse:eclipse to generate the project files. Removed Paths: ------------- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.classpath cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.project Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.classpath =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.classpath 2009-03-17 14:56:41 UTC (rev 90) +++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.classpath 2009-03-17 14:57:09 UTC (rev 91) @@ -1,34 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar" sourcepath="M2_REPO/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-sources.jar"> - <attributes> - <attribute value="jar:file:/D:/development/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.4/commons-lang-2.4-sources.jar"> - <attributes> - <attribute value="jar:file:/D:/development/repository/commons-lang/commons-lang/2.4/commons-lang-2.4-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar" sourcepath="M2_REPO/org/easymock/easymock/2.2/easymock-2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar" sourcepath="M2_REPO/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar" sourcepath="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"> - <attributes> - <attribute value="jar:file:/D:/development/repository/junit/junit/4.4/junit-4.4-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.6/mysql-connector-java-5.1.6.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.5.6/slf4j-log4j12-1.5.6-sources.jar"/> - <classpathentry kind="src" path="/test-utilities"/> - <classpathentry kind="var" path="M2_REPO/toplink/essentials/toplink-essentials/2.1-60e/toplink-essentials-2.1-60e.jar" sourcepath="M2_REPO/toplink/essentials/toplink-essentials/2.1-60e/toplink-essentials-2.1-60e-sources.jar"/> -</classpath> \ No newline at end of file Deleted: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.project =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.project 2009-03-17 14:56:41 UTC (rev 90) +++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/.project 2009-03-17 14:57:09 UTC (rev 91) @@ -1,24 +0,0 @@ -<projectDescription> - <name>sc-cdmm</name> - <comment/> - <projects> - <project>test-utilities</project> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - </natures> -</projectDescription> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-17 14:56:50
|
Revision: 90 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=90&view=rev Author: idueppe Date: 2009-03-17 14:56:41 +0000 (Tue, 17 Mar 2009) Log Message: ----------- removed generated files. Use mvn eclipse:eclipse to generate the project files. Removed Paths: ------------- cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/.classpath Deleted: cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/.classpath =================================================================== --- cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/.classpath 2009-03-17 14:54:25 UTC (rev 89) +++ cse-ip/trunk/sandbox/cse-ip/framework/test-utilities/.classpath 2009-03-17 14:56:41 UTC (rev 90) @@ -1,17 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/easymock/easymock/2.2/easymock-2.2.jar" sourcepath="M2_REPO/org/easymock/easymock/2.2/easymock-2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2.jar" sourcepath="M2_REPO/org/easymock/easymockclassextension/2.2/easymockclassextension-2.2-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar" sourcepath="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar" sourcepath="M2_REPO/junit/junit/4.4/junit-4.4-sources.jar"> - <attributes> - <attribute value="jar:file:/D:/development/repository/junit/junit/4.4/junit-4.4-javadoc.jar!/" name="javadoc_location"/> - </attributes> - </classpathentry> - <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/toplink/essentials/toplink-essentials/2.1-60e/toplink-essentials-2.1-60e.jar" sourcepath="M2_REPO/toplink/essentials/toplink-essentials/2.1-60e/toplink-essentials-2.1-60e-sources.jar"/> -</classpath> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2009-03-17 14:54:50
|
Revision: 89 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=89&view=rev Author: roekens Date: 2009-03-17 14:54:25 +0000 (Tue, 17 Mar 2009) Log Message: ----------- bugfix to make project buildable :-) Modified Paths: -------------- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java Modified: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-17 14:29:47 UTC (rev 88) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-17 14:54:25 UTC (rev 89) @@ -18,7 +18,7 @@ EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("cseip"); EntityManager entityManager = entityManagerFactory.createEntityManager(); - List<MappedClientObject> mappings = entityManager.createQuery("SELECT m FROM MapperClientObject m").getResultList(); + List<MappedClientObject> mappings = entityManager.createQuery("SELECT m FROM MappedClientObject m").getResultList(); assertNotNull(mappings); entityManager.close(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <id...@us...> - 2009-03-17 14:30:16
|
Revision: 88 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=88&view=rev Author: idueppe Date: 2009-03-17 14:29:47 +0000 (Tue, 17 Mar 2009) Log Message: ----------- Refactoring of the IdentityMapper interface. Modified Paths: -------------- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml Added Paths: ----------- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperLocal.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java Removed Paths: ------------- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/idmapper/ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/idmapper/ Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,26 @@ +package de.campussource.cse.mapper; + + +/** + * + * @author Ingo Dueppe + */ +public class IdNotFoundException extends MapperException { + + private static final long serialVersionUID = 3260263352045745855L; + + public IdNotFoundException() {} + + public IdNotFoundException(String message) { + super(message); + } + + public IdNotFoundException(Throwable cause) { + super(cause); + } + + public IdNotFoundException(String message, Throwable cause) { + super(message, cause); + } + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdNotFoundException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,45 @@ +package de.campussource.cse.mapper; + +import javax.ejb.Remote; + +/** + * IdentityMapper manage the administration of mappings between the global + * unique busId and client specific object ids. Each mapping exists of three + * ids. The global unique bus id, the client instance unique object id, and the + * client unique instance id. + * + * @author Ingo Dueppe + */ +@Remote +public interface IdentityMapper { + + /** + * Convert a clientInstanceId and a clientObjectId to a busID. If the busId + * doesn't exist for the given combination of the parameters then a new busId will be generated. + * + * @param clientInstanceId the Id of the client instance. + * @param clientObjectId the Id of the client object. The id can be any arbitrary string. + * @return busId according to the clientInstance- and clientObjectId. + */ + public Long toBusId(Long clientInstanceId, String clientObjectId); + + /** + * Convert the combination of busId and clientInstanceId to a clientObjectId. + * + * @param busId a existing bus id. + * @param clientInstanceId a existing client instance id. + * @return the corresponding clientObjectID + * @throws IdNotFoundException thrown if either the busId or the clientInstanceId doesn't exists. + */ + public String toClientObjectId(Long busId, Long clientInstanceId) throws IdNotFoundException; + + /** + * Save or update the clientObjectId according to the given busId and clientInstanceId. + * + * @param busId the global unique busId. + * @param clientInstanceId the global unique client instance id. + * @param clientObjectId the client unique object id. + */ + public void persistClientObjectId(Long busId, Long clientInstanceId, String clientObjectId); + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapper.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,78 @@ +package de.campussource.cse.mapper; + +import javax.ejb.Stateless; +import javax.ejb.TransactionAttribute; +import javax.ejb.TransactionAttributeType; +import javax.persistence.EntityExistsException; +import javax.persistence.EntityManager; +import javax.persistence.NoResultException; +import javax.persistence.PersistenceContext; +import javax.persistence.Query; + +import org.apache.commons.lang.Validate; + +/** + * Standard IdentityMapper implementation + * @author Ingo Dueppe + */ +@Stateless +public class IdentityMapperBean implements IdentityMapper { + + @PersistenceContext + private EntityManager em; + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public void persistClientObjectId(Long busId, Long clientInstanceId, String clientObjectId) { + Validate.notNull(busId, "IdentityMapper.persistClientObjectId: Parameter busId is mandatory."); + Validate.notNull(clientInstanceId, "IdentityMapper.persistClientObjectId: Parameter clientInstanceId is mandatory."); + Validate.notEmpty(clientObjectId, "IdentityMapper.persistClientObjectId: Parameter clientObjectId is mandatory."); + MappedClientObject mapped = new MappedClientObject(busId, clientInstanceId, clientObjectId); + try { + em.persist(mapped); + } catch (EntityExistsException eee) { + em.merge(mapped); + } + System.out.println("MappedClientObject "+mapped.toString()); + } + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public Long toBusId(Long clientInstanceId, String clientObjectId) { + Validate.notNull(clientInstanceId, "IdentityMapper.toBusId: Parameter clientInstanceId is mandatory."); + Validate.notNull(clientObjectId, "IdentityMapper.toBusId: Parameter clientObjectId is mandatory."); + try { + Query query = em.createNamedQuery(MappedClientObject.FIND_BUSID); + query.setParameter("clientInstanceId", clientInstanceId); + query.setParameter("clientObjectId", clientObjectId); + return (Long) query.getSingleResult(); + } catch (NoResultException nre) { + return createMapping(clientInstanceId, clientObjectId); + } + } + + private Long createMapping(Long clientInstanceId, String clientObjectId) { + MappedClientObject mapped = new MappedClientObject(); + mapped.setClientInstanceId(clientInstanceId); + mapped.setClientObjectId(clientObjectId); + em.persist(mapped); + return mapped.getBusId(); + } + + @Override + @TransactionAttribute(TransactionAttributeType.REQUIRED) + public String toClientObjectId(Long busId, Long clientInstanceId) throws IdNotFoundException { + Validate.notNull(busId,"IdentityMapper.toClientObjectId: Parameter busId is mandatory."); + Validate.notNull(clientInstanceId,"IdentityMapper.toClientObjectId: Parameter clientInstanceId is mandatory."); + try { + Query query = em.createNamedQuery(MappedClientObject.FIND_OBJECTID); + query.setParameter("clientInstanceId", clientInstanceId); + query.setParameter("busId", busId); + return (String) query.getSingleResult(); + } catch (NoResultException nre) { + throw new IdNotFoundException(nre); + } + + } + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperBean.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperLocal.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperLocal.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperLocal.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,13 @@ +package de.campussource.cse.mapper; + +import javax.ejb.Local; + +/** + * The local interface of IdentityMapper + * @see de.campussource.cse.mapper.IdentityMapper + * @author Ingo Dueppe + */ +@Local +public interface IdentityMapperLocal extends IdentityMapper { + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/IdentityMapperLocal.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,102 @@ +package de.campussource.cse.mapper; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.IdClass; +import javax.persistence.NamedQueries; +import javax.persistence.NamedQuery; +import javax.persistence.Table; +import javax.persistence.UniqueConstraint; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +@Entity(name="MappedClientObject") +@Table(name = "MAPPED_CLIENT_OBJECT", + uniqueConstraints = @UniqueConstraint(columnNames = { "CLIENT_OBJECT_ID", "CLIENT_INSTANCE_ID" })) +@NamedQueries(value = { + @NamedQuery( + name = "MappedClientObject.findObjectId", + query = "select c.clientObjectId from MappedClientObject c where c.busId=:busId and c.clientInstanceId = :clientInstanceId"), + @NamedQuery( + name = "MappedClientObject.findBusId", + query = "select c.busId from MappedClientObject c where c.clientObjectId=:clientObjectId and c.clientInstanceId = :clientInstanceId") }) +@IdClass(value=MappedClientObjectPK.class) +public class MappedClientObject { + + public static final String FIND_OBJECTID = "MappedClientObject.findObjectId"; + public static final String FIND_BUSID = "MappedClientObject.findBusId"; + + private Long busId; + + private Long clientInstanceId; + + private String clientObjectId; + + public MappedClientObject() { + }; + + public MappedClientObject(Long busId, Long clientInstanceId, String clientObjectId) { + this.busId = busId; + this.clientInstanceId = clientInstanceId; + this.clientObjectId = clientObjectId; + } + + @Id + @Column(name="BUS_ID", nullable = false) + @GeneratedValue(strategy = GenerationType.AUTO) + public Long getBusId() { + return busId; + } + + public void setBusId(Long busId) { + this.busId = busId; + } + + @Id + @Column(name="CLIENT_INSTANCE_ID", nullable=false) + public Long getClientInstanceId() { + return clientInstanceId; + } + + public void setClientInstanceId(Long clientInstanceId) { + this.clientInstanceId = clientInstanceId; + } + + @Column(name="CLIENT_OBJECT_ID", nullable=false) + public String getClientObjectId() { + return clientObjectId; + } + + public void setClientObjectId(String clientObjectId) { + this.clientObjectId = clientObjectId; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof MappedClientObject)) { + return false; + } else { + MappedClientObject other = (MappedClientObject) obj; + return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId) + .append(clientObjectId, other.clientObjectId).isEquals(); + } + } + + public int hashCode() { + return new HashCodeBuilder().append(busId).append(clientInstanceId).append(clientObjectId).toHashCode(); + } + + public String toString() { + return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(busId).append(clientInstanceId).append( + clientObjectId).toString(); + } + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,60 @@ +package de.campussource.cse.mapper; + +import java.io.Serializable; + +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; + +/** + * @author Ingo Dueppe + */ +public class MappedClientObjectPK implements Serializable { + + private static final long serialVersionUID = 4835950977456597594L; + + private Long busId; + private Long clientInstanceId; + + public MappedClientObjectPK() {} + + public Long getBusId() { + return busId; + } + + public void setBusId(Long busId) { + this.busId = busId; + } + + public Long getClientInstanceId() { + return clientInstanceId; + } + + public void setClientInstanceId(Long clientInstanceId) { + this.clientInstanceId = clientInstanceId; + } + + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof MappedClientObjectPK)) { + return false; + } else { + MappedClientObjectPK other = (MappedClientObjectPK) obj; + return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId) + .isEquals(); + } + } + + public int hashCode() { + return new HashCodeBuilder().append(busId).append(clientInstanceId).toHashCode(); + } + + public String toString() { + return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(busId).append(clientInstanceId).toString(); + } + + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,26 @@ +package de.campussource.cse.mapper; + +/** + * General mapper exception + * @author Ingo Dueppe + */ +public class MapperException extends Exception { + + private static final long serialVersionUID = -2553188081269164040L; + + public MapperException() { + } + + public MapperException(String message) { + super(message); + } + + public MapperException(Throwable cause) { + super(cause); + } + + public MapperException(String message, Throwable cause) { + super(message, cause); + } + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MapperException.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-17 14:28:11 UTC (rev 87) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-17 14:29:47 UTC (rev 88) @@ -1,21 +1,93 @@ package de.campussource.cse.mapper; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; -import java.net.MalformedURLException; -import java.net.URL; - import org.junit.Before; import org.junit.Test; -import de.campussource.cse.idmapper.ClientInstance; -import de.campussource.cse.idmapper.IdMapperBean; +import de.campussource.cse.common.test.AbstractPersistentUnitTest; +public class IdentityMapperTest extends AbstractPersistentUnitTest { -public class IdentityMapperTest { + private static final Long UNKNOWN_BUS_ID = -1000L; + private static final Long BUS_ID = 1000L; + private static final Long CLIENT_INSTANCE_ID = 1000L; + private static final String CLIENT_OBJECT_ID = "CSE:SYSTEM:CLIENTID"; + + private IdentityMapper mapper; + + @Before + public void setUp() { + txBegin(); + mapper = new IdentityMapperBean(); + autowireByType(mapper); + } + @Test - public void testPersistClientObjectId() throws MalformedURLException { + public void testBusToClientMapping() throws MapperException { + Long busId = mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID); + String clientId = mapper.toClientObjectId(busId, CLIENT_INSTANCE_ID); + assertEquals(CLIENT_OBJECT_ID, clientId); } - + @Test(expected = IdNotFoundException.class) + public void testBusIdNotFound() throws IdNotFoundException { + mapper.toClientObjectId(CLIENT_INSTANCE_ID, UNKNOWN_BUS_ID); + } + + @Test(expected = IdNotFoundException.class) + public void testClientObjectIdNotFound() throws IdNotFoundException { + Long busId = mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID); + assertNotNull(busId); + mapper.toClientObjectId(busId, CLIENT_INSTANCE_ID + uniqueId()); + } + + @Test + public void testPersistClientObjectId() throws MapperException { + // Persist a new mapping of client object id to a given bus id and verify the results + mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID); + commitAndBeginTx(); + assertEquals(BUS_ID, mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID)); + assertEquals(CLIENT_OBJECT_ID, mapper.toClientObjectId(BUS_ID, CLIENT_INSTANCE_ID)); + // Override the existing mapping to a new client object id and verify the results + mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, "NEW:CLIENT:OBJECT:ID"); + assertEquals(BUS_ID, mapper.toBusId(CLIENT_INSTANCE_ID, "NEW:CLIENT:OBJECT:ID")); + assertEquals("NEW:CLIENT:OBJECT:ID", mapper.toClientObjectId(BUS_ID, CLIENT_INSTANCE_ID)); + } + + @Test(expected = IllegalArgumentException.class) + public void testToBusNoClientInstanceParameter() throws IdNotFoundException { + mapper.toBusId(null, CLIENT_OBJECT_ID); + } + + @Test(expected = IllegalArgumentException.class) + public void testToBusNoObjectIdParameter() throws IdNotFoundException { + mapper.toBusId(CLIENT_INSTANCE_ID, null); + } + + @Test(expected = IllegalArgumentException.class) + public void testToClientNoBusIdParameter() throws IdNotFoundException { + mapper.toClientObjectId(null, CLIENT_INSTANCE_ID); + } + + @Test(expected = IllegalArgumentException.class) + public void testToClientNoInstanceIdParameter() throws IdNotFoundException { + mapper.toClientObjectId(BUS_ID, null); + } + + @Test(expected = IllegalArgumentException.class) + public void testPersistNoBusIdParameter() throws IdNotFoundException { + mapper.persistClientObjectId(null, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID); + } + + @Test(expected = IllegalArgumentException.class) + public void testPersistNoInstanceIdParameter() throws IdNotFoundException { + mapper.persistClientObjectId(BUS_ID, null, CLIENT_OBJECT_ID); + } + + @Test(expected = IllegalArgumentException.class) + public void testPersistNoObjectIdParameter() throws IdNotFoundException { + mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, ""); + } } Copied: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java (from rev 78, cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/idmapper/PersistentUnitConfigurationTest.java) =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java (rev 0) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-17 14:29:47 UTC (rev 88) @@ -0,0 +1,32 @@ +package de.campussource.cse.mapper; + +import static org.junit.Assert.assertNotNull; + +import java.util.List; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; + +import org.junit.Test; + +public class PersistentUnitConfigurationTest { + + @Test + public void testConfiguration() { + try { + EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("cseip"); + EntityManager entityManager = entityManagerFactory.createEntityManager(); + + List<MappedClientObject> mappings = entityManager.createQuery("SELECT m FROM MapperClientObject m").getResultList(); + assertNotNull(mappings); + + entityManager.close(); + entityManagerFactory.close(); + } catch (RuntimeException rt) { + rt.printStackTrace(); + throw rt; + } + } + +} Property changes on: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml =================================================================== --- cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-17 14:28:11 UTC (rev 87) +++ cse-ip/trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-17 14:29:47 UTC (rev 88) @@ -4,12 +4,10 @@ version="1.0"> <persistence-unit name="cseip" transaction-type="RESOURCE_LOCAL"> <provider>oracle.toplink.essentials.PersistenceProvider</provider> - <class>de.campussource.cse.idmapper.ClientInstance</class> - <class>de.campussource.cse.idmapper.ClientObject</class> + <class>de.campussource.cse.mapper.MappedClientObject</class> <properties> <property name="toplink.ddl-generation" value="drop-and-create-tables" /> <property name="toplink.jdbc.driver" value="com.mysql.jdbc.Driver" /> -<!-- <property name="toplink.jdbc.url" value="jdbc:mysql://localhost:3306/cseip?profileSQL=true&createDatabaseIfNotExist=true" />--> <property name="toplink.jdbc.url" value="jdbc:mysql://localhost:3306/cseip?createDatabaseIfNotExist=true" /> <property name="toplink.jdbc.user" value="root" /> <property name="toplink.jdbc.password" value="masterkey" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |