From: <pka...@us...> - 2009-07-28 22:18:55
|
Revision: 393 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=393&view=rev Author: pkasprzak Date: 2009-07-28 22:18:45 +0000 (Tue, 28 Jul 2009) Log Message: ----------- * Correlation Stuff :) Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/catalog.xml trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/genfiles.properties trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jax-ws.xml trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jaxws-build.xml Added Paths: ----------- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.wsdl trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.xsd Modified: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/catalog.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/catalog.xml 2009-07-28 22:17:03 UTC (rev 392) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/catalog.xml 2009-07-28 22:18:45 UTC (rev 393) @@ -2,5 +2,6 @@ <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="system"> <system systemId="file:/home/pete/dipl/devel/cse-ip/CSECore-ejb/../Common/src/CDDM.xsd" uri="src/conf/xml-resources/jaxb/cddm/CDDM.xsd"/> <system systemId="file:/home/pete/dipl/devel/cse-ip/Common/src/DependencyManagerNotification.wsdl" uri="src/conf/xml-resources/web-service-references/DependencyManagerNotification/wsdl/DependencyManagerNotification.wsdl"/> - <system systemId="file:/home/pete/NetBeansProjects/CSE-IP/Common/src/DependencyManagerNotification.wsdl" uri="src/conf/xml-resources/web-service-references/DependencyManagerNotification/wsdl/DependencyManagerNotification.wsdl"/> + <system systemId="file:/home/pete/dipl/devel/cse-ip/Common/src/DependencyManager.wsdl" uri="src/conf/xml-resources/web-service-references/DependencyManager/wsdl/DependencyManager.wsdl"/> + <system systemId="file:/home/pete/dipl/devel/cse-ip/Common/src/DependencyManager.xsd" uri="src/conf/xml-resources/web-service-references/DependencyManager/wsdl/DependencyManager.xsd"/> </catalog> \ No newline at end of file Modified: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/build-impl.xml 2009-07-28 22:17:03 UTC (rev 392) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/build-impl.xml 2009-07-28 22:18:45 UTC (rev 393) @@ -16,8 +16,8 @@ --> <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="CSECore-ejb-impl"> + <import file="jaxws-build.xml"/> <import file="xml_binding_build.xml"/> - <import file="jaxws-build.xml"/> <import file="ant-deploy.xml"/> <target depends="dist,javadoc" description="Build whole project." name="default"/> <!-- @@ -290,7 +290,7 @@ <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-client-generate,jaxb-code-generation" name="-pre-pre-compile"> + <target depends="init,deps-jar,jaxb-code-generation,wsimport-client-generate" name="-pre-pre-compile"> <mkdir dir="${build.classes.dir}"/> <mkdir dir="${build.ear.classes.dir}"/> </target> Modified: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/genfiles.properties 2009-07-28 22:17:03 UTC (rev 392) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/genfiles.properties 2009-07-28 22:18:45 UTC (rev 393) @@ -4,6 +4,6 @@ # 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=c7301153 -nbproject/build-impl.xml.script.CRC32=1447b5e1 +nbproject/build-impl.xml.script.CRC32=0196441b nbproject/build-impl.xml.stylesheet.CRC32=36c39d59 nbproject/jaxws-build.xml.stylesheet.CRC32=f49c6152 Modified: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jax-ws.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jax-ws.xml 2009-07-28 22:17:03 UTC (rev 392) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jax-ws.xml 2009-07-28 22:18:45 UTC (rev 393) @@ -10,18 +10,18 @@ <service name="RelationManager"> <implementation-class>de.campussource.cse.core.RelationManagerWS</implementation-class> </service> - <service name="DependencyManagerWS"> + <service name="SystemManager"> + <implementation-class>de.campussource.cse.core.SystemManagerWS</implementation-class> + </service> + <service name="DependencyManager"> <implementation-class>de.campussource.cse.core.DependencyManagerWS</implementation-class> </service> - <service name="SystemManagerWS"> - <implementation-class>de.campussource.cse.core.SystemManagerWS</implementation-class> - </service> </services> <clients> - <client name="DependencyManagerNotification"> - <wsdl-url>file:/home/pete/NetBeansProjects/CSE-IP/Common/src/DependencyManagerNotification.wsdl</wsdl-url> - <local-wsdl-file>DependencyManagerNotification.wsdl</local-wsdl-file> - <package-name>org.netbeans.j2ee.wsdl.common.dependencymanagernotification</package-name> + <client name="DependencyManager"> + <wsdl-url>file:/home/pete/dipl/devel/cse-ip/Common/src/DependencyManager.wsdl</wsdl-url> + <local-wsdl-file>DependencyManager.wsdl</local-wsdl-file> + <package-name>de.campussource.cse.ejb.dependencymanager</package-name> <catalog-file>catalog.xml</catalog-file> <wsimport-options> <wsimport-option> @@ -34,7 +34,7 @@ </wsimport-option> <wsimport-option> <wsimport-option-name>wsdlLocation</wsimport-option-name> - <wsimport-option-value>file:/home/pete/NetBeansProjects/CSE-IP/Common/src/DependencyManagerNotification.wsdl</wsimport-option-value> + <wsimport-option-value>file:/home/pete/dipl/devel/cse-ip/Common/src/DependencyManager.wsdl</wsimport-option-value> </wsimport-option> <wsimport-option> <wsimport-option-name>xnocompile</wsimport-option-name> Modified: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jaxws-build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jaxws-build.xml 2009-07-28 22:17:03 UTC (rev 392) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/nbproject/jaxws-build.xml 2009-07-28 22:18:45 UTC (rev 393) @@ -13,7 +13,7 @@ <classpath path="${j2ee.platform.wsgen.classpath}"/> </taskdef> </target> - <target name="wsgen-compile" depends="wsgen-EntityManager, wsgen-IdentityManager, wsgen-RelationManager, wsgen-DependencyManagerWS, wsgen-SystemManagerWS"> + <target name="wsgen-compile" depends="wsgen-EntityManager, wsgen-IdentityManager, wsgen-RelationManager, wsgen-SystemManager, wsgen-DependencyManager"> <ejbjarproject2:javac srcdir="${build.generated.dir}/wsgen/service" classpath="${j2ee.platform.wsgen.classpath}:${javac.classpath}" destdir="${classes.dir}"/> </target> <target name="wsgen-EntityManager" depends="wsgen-init, -do-compile"> @@ -31,13 +31,13 @@ <classpath path="${java.home}/../lib/tools.jar:${classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/> </wsgen> </target> - <target name="wsgen-DependencyManagerWS" depends="wsgen-init, -do-compile"> - <wsgen destdir="${build.generated.dir}/wsgen/binaries" sourcedestdir="${build.generated.dir}/wsgen/service" resourcedestdir="${build.generated.dir}/wsgen/service/resources/" xendorsed="true" keep="false" genwsdl="true" sei="de.campussource.cse.core.DependencyManagerWS"> + <target name="wsgen-SystemManager" depends="wsgen-init, -do-compile"> + <wsgen destdir="${build.generated.dir}/wsgen/binaries" sourcedestdir="${build.generated.dir}/wsgen/service" resourcedestdir="${build.generated.dir}/wsgen/service/resources/" xendorsed="true" keep="false" genwsdl="true" sei="de.campussource.cse.core.SystemManagerWS"> <classpath path="${java.home}/../lib/tools.jar:${classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/> </wsgen> </target> - <target name="wsgen-SystemManagerWS" depends="wsgen-init, -do-compile"> - <wsgen destdir="${build.generated.dir}/wsgen/binaries" sourcedestdir="${build.generated.dir}/wsgen/service" resourcedestdir="${build.generated.dir}/wsgen/service/resources/" xendorsed="true" keep="false" genwsdl="true" sei="de.campussource.cse.core.SystemManagerWS"> + <target name="wsgen-DependencyManager" depends="wsgen-init, -do-compile"> + <wsgen destdir="${build.generated.dir}/wsgen/binaries" sourcedestdir="${build.generated.dir}/wsgen/service" resourcedestdir="${build.generated.dir}/wsgen/service/resources/" xendorsed="true" keep="false" genwsdl="true" sei="de.campussource.cse.core.DependencyManagerWS"> <classpath path="${java.home}/../lib/tools.jar:${classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/> </wsgen> </target> @@ -54,19 +54,19 @@ <classpath path="${j2ee.platform.wsimport.classpath}"/> </taskdef> </target> - <target name="wsimport-client-check-DependencyManagerNotification" depends="wsimport-init"> - <condition property="wsimport-client-DependencyManagerNotification.notRequired"> - <available file="${build.generated.dir}/wsimport/client/org/netbeans/j2ee/wsdl/common/dependencymanagernotification/DependencyManagerNotification.java"/> + <target name="wsimport-client-check-DependencyManager" depends="wsimport-init"> + <condition property="wsimport-client-DependencyManager.notRequired"> + <available file="${build.generated.dir}/wsimport/client/de/campussource/cse/ejb/dependencymanager/DependencyManager.java"/> </condition> </target> - <target name="wsimport-client-DependencyManagerNotification" depends="wsimport-init,wsimport-client-check-DependencyManagerNotification" unless="wsimport-client-DependencyManagerNotification.notRequired"> - <property name="wsdl-DependencyManagerNotification" location="${meta.inf}/xml-resources/web-service-references/DependencyManagerNotification/wsdl/DependencyManagerNotification.wsdl"/> - <wsimport sourcedestdir="${build.generated.dir}/wsimport/client" destdir="${build.generated.dir}/wsimport/binaries" wsdl="${wsdl-DependencyManagerNotification}" catalog="catalog.xml" extension="true" verbose="true" wsdlLocation="file:/home/pete/NetBeansProjects/CSE-IP/Common/src/DependencyManagerNotification.wsdl" xnocompile="true"/> + <target name="wsimport-client-DependencyManager" depends="wsimport-init,wsimport-client-check-DependencyManager" unless="wsimport-client-DependencyManager.notRequired"> + <property name="wsdl-DependencyManager" location="${meta.inf}/xml-resources/web-service-references/DependencyManager/wsdl/DependencyManager.wsdl"/> + <wsimport sourcedestdir="${build.generated.dir}/wsimport/client" destdir="${build.generated.dir}/wsimport/binaries" wsdl="${wsdl-DependencyManager}" catalog="catalog.xml" extension="true" verbose="true" wsdlLocation="file:/home/pete/dipl/devel/cse-ip/Common/src/DependencyManager.wsdl" xnocompile="true"/> </target> - <target name="wsimport-client-clean-DependencyManagerNotification" depends="-init-project"> - <delete dir="${build.generated.dir}/wsimport/client/org/netbeans/j2ee/wsdl/common/dependencymanagernotification"/> + <target name="wsimport-client-clean-DependencyManager" depends="-init-project"> + <delete dir="${build.generated.dir}/wsimport/client/de/campussource/cse/ejb/dependencymanager"/> </target> - <target name="wsimport-client-generate" depends="wsimport-client-DependencyManagerNotification"/> + <target name="wsimport-client-generate" depends="wsimport-client-DependencyManager"/> <target name="wsimport-client-compile" depends="wsimport-client-generate"> <ejbjarproject2:javac srcdir="${build.generated.dir}/wsimport/client" classpath="${j2ee.platform.wsimport.classpath}:${javac.classpath}" destdir="${classes.dir}"/> <copy todir="${classes.dir}"> Added: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.wsdl =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.wsdl (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.wsdl 2009-07-28 22:18:45 UTC (rev 393) @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3.1-hudson-749-SNAPSHOT. --> +<!-- Generated by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3.1-hudson-749-SNAPSHOT. --> +<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tns="http://cse.campussource.de/ejb/DependencyManager" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop" + xmlns="http://schemas.xmlsoap.org/wsdl/" + targetNamespace="http://cse.campussource.de/ejb/DependencyManager" + name="DependencyManagerWSService"> + + <ns1:Policy xmlns:ns1="http://www.w3.org/ns/ws-policy" wsu:Id="DependencyManagerPortBinding_satisfyDependencies_WSAT_Policy"> + <ns1:ExactlyOne> + <ns1:All> + <ns2:ATAlwaysCapability xmlns:ns2="http://schemas.xmlsoap.org/ws/2004/10/wsat"></ns2:ATAlwaysCapability> + <ns3:ATAssertion xmlns:ns4="http://schemas.xmlsoap.org/ws/2002/12/policy" xmlns:ns3="http://schemas.xmlsoap.org/ws/2004/10/wsat" ns1:Optional="true" ns4:Optional="true"></ns3:ATAssertion> + </ns1:All> + </ns1:ExactlyOne> + </ns1:Policy> + <ns5:Policy xmlns:ns5="http://www.w3.org/ns/ws-policy" wsu:Id="DependencyManagerPortBinding_waitForDependencies_WSAT_Policy"> + <ns5:ExactlyOne> + <ns5:All> + <ns6:ATAlwaysCapability xmlns:ns6="http://schemas.xmlsoap.org/ws/2004/10/wsat"></ns6:ATAlwaysCapability> + <ns7:ATAssertion xmlns:ns8="http://schemas.xmlsoap.org/ws/2002/12/policy" xmlns:ns7="http://schemas.xmlsoap.org/ws/2004/10/wsat" ns5:Optional="true" ns8:Optional="true"></ns7:ATAssertion> + </ns5:All> + </ns5:ExactlyOne> + </ns5:Policy> + + <types> + <xsd:schema> + <xsd:import namespace="http://cse.campussource.de/ejb/DependencyManager" schemaLocation="DependencyManager.xsd"></xsd:import> + </xsd:schema> + </types> + + <message name="waitForDependencies"> + <part name="parameters" element="tns:waitForDependencies"></part> + </message> + + <message name="satisfyDependencies"> + <part name="parameters" element="tns:satisfyDependencies"></part> + </message> + + <message name="notifyRequest"> + <part name="entityId" type="xsd:int"/> + <part name="system" type="xsd:string"/> + </message> + + <portType name="DependencyManager"> + <operation name="waitForDependencies"> + <input message="tns:waitForDependencies"></input> + </operation> + <operation name="satisfyDependencies"> + <input message="tns:satisfyDependencies"></input> + </operation> + </portType> + + <portType name="DependencyManagerNotification"> + <operation name="notify"> + <input name="input1" message="tns:notifyRequest"/> + </operation> + </portType> + + <binding name="DependencyManagerPortBinding" type="tns:DependencyManager"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"></soap:binding> + <operation name="waitForDependencies"> + <ns9:PolicyReference xmlns:ns9="http://www.w3.org/ns/ws-policy" URI="#DependencyManagerPortBinding_waitForDependencies_WSAT_Policy"></ns9:PolicyReference> + <soap:operation soapAction=""></soap:operation> + <input> + <soap:body use="literal"></soap:body> + </input> + </operation> + <operation name="satisfyDependencies"> + <ns10:PolicyReference xmlns:ns10="http://www.w3.org/ns/ws-policy" URI="#DependencyManagerPortBinding_satisfyDependencies_WSAT_Policy"></ns10:PolicyReference> + <soap:operation soapAction=""></soap:operation> + <input> + <soap:body use="literal"></soap:body> + </input> + + </operation> + </binding> + + <binding name="DependencyManagerNotificationBinding" type="tns:DependencyManagerNotification"> + <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="notify"> + <soap:operation/> + <input name="input1"> + <soap:body use="literal" namespace="http://j2ee.netbeans.org/wsdl/Common/DependencyManagerNotification"/> + </input> + </operation> + </binding> + + <service name="DependencyManagerWSService"> + <port name="DependencyManagerPort" binding="tns:DependencyManagerPortBinding"> + <soap:address location="http://localhost:8080/DependencyManagerWSService/DependencyManager"></soap:address> + </port> + </service> + + <service name="DependencyManagerNotificationService"> + <port name="DependencyManagerNotificationPort" binding="tns:DependencyManagerNotificationBinding"> + <soap:address location="http://localhost:${HttpDefaultPort}/DependencyManagerNotificationService/DependencyManagerNotification"/> + </port> + </service> + + <plnk:partnerLinkType name="DependencyManagerLinkType"> + <plnk:role name="DependencyManager_Provider" portType="tns:DependencyManager"/> + <plnk:role name="DependencyManager_Requestor" portType="tns:DependencyManagerNotification"/> + </plnk:partnerLinkType> + + <vprop:property name="EntityId" type="xsd:int"/> + + <vprop:propertyAlias propertyName="tns:EntityId" messageType="tns:waitForDependencies" part="parameters"> + <vprop:query>/tns:waitForDependencies/entityId</vprop:query> + </vprop:propertyAlias> + + <vprop:propertyAlias propertyName="tns:EntityId" messageType="tns:notifyRequest" part="entityId"/> + +</definitions> \ No newline at end of file Added: trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.xsd =================================================================== --- trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.xsd (rev 0) +++ trunk/sandbox/lsf-adapter-demo/CSECore-ejb/src/conf/wsdl/client/DependencyManager/DependencyManager.xsd 2009-07-28 22:18:45 UTC (rev 393) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Published by JAX-WS RI at http://jax-ws.dev.java.net. RI's version is JAX-WS RI 2.1.3.1-hudson-749-SNAPSHOT. --> +<xs:schema xmlns:tns="http://cse.campussource.de/ejb/DependencyManager" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="1.0" targetNamespace="http://cse.campussource.de/ejb/DependencyManager"> + + <xs:element name="satisfyDependencies" type="tns:satisfyDependencies"></xs:element> + + <xs:element name="waitForDependencies" type="tns:waitForDependencies"></xs:element> + + <xs:complexType name="satisfyDependencies"> + <xs:sequence> + <xs:element name="entityId" type="xs:int"></xs:element> + <xs:element name="system" type="xs:string" minOccurs="0"></xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="waitForDependencies"> + <xs:sequence> + <xs:element name="entityId" type="xs:int"></xs:element> + </xs:sequence> + + </xs:complexType> +</xs:schema> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |