Author: mriou
Date: Wed Jul 26 11:24:40 2006
New Revision: 425799
URL: http://svn.apache.org/viewvc?rev=425799&view=rev
Log:
Changed example URLs to get a pxe url (will change to Ode when relocating),
fixed a small bug in deployment, made sure everything works as expected.
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/DynPartnerMain.bpel
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Main.wsdl
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Responder.wsdl
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/HelloWorld2.wsdl
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/deploy.xml
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/MagicSession/Main.wsdl
incubator/ode/scratch/pxe-iapi/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
incubator/ode/scratch/pxe-iapi/axis2/src/main/java/com/fs/pxe/axis2/DeploymentPoller.java
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/DynPartnerMain.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/DynPartnerMain.bpel?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/DynPartnerMain.bpel
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/DynPartnerMain.bpel
Wed Jul 26 11:24:40 2006
@@ -69,7 +69,7 @@
<assign>
<copy>
<from>
-
<literal>http://localhost:8080/axis2/processes/DynResponderService</literal>
+
<literal>http://localhost:8080/pxe/processes/DynResponderService</literal>
</from>
<to partnerLink="responderPartnerLink"/>
</copy>
@@ -77,7 +77,7 @@
<from>
<literal>
<service-ref>
- <soap:address
location="http://localhost:8080/axis2/processes/DynResponderService"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/DynResponderService"/>
</service-ref>
</literal>
</from>
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Main.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Main.wsdl?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Main.wsdl
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Main.wsdl
Wed Jul 26 11:24:40 2006
@@ -43,7 +43,7 @@
<wsdl:service name="DynMainService">
<wsdl:port name="DynMainPort" binding="tns:DynMainBinding">
- <soap:address
location="http://localhost:8080/axis2/processes/DynMainService"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/DynMainService"/>
</wsdl:port>
</wsdl:service>
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Responder.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Responder.wsdl?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Responder.wsdl
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/DynPartner/Responder.wsdl
Wed Jul 26 11:24:40 2006
@@ -74,7 +74,7 @@
<wsdl:service name="DynResponderService">
<wsdl:port name="DynResponderPort" binding="tns:DynResponderBinding">
- <soap:address
location="http://localhost:8080/axis2/processes/DynResponderService"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/DynResponderService"/>
</wsdl:port>
</wsdl:service>
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/HelloWorld2.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/HelloWorld2.wsdl?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/HelloWorld2.wsdl
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/HelloWorld2.wsdl
Wed Jul 26 11:24:40 2006
@@ -39,7 +39,7 @@
</wsdl:binding>
<wsdl:service name="HelloService">
<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
- <soap:address
location="http://localhost:@PXE_HTTP_PORT@/axis2/processes/helloWorld"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/helloWorld"/>
</wsdl:port>
</wsdl:service>
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/deploy.xml?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/deploy.xml
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/HelloWorld2/deploy.xml
Wed Jul 26 11:24:40 2006
@@ -2,6 +2,7 @@
xmlns:pns="http://pxe/bpel/unit-test";
xmlns:wns="http://pxe/bpel/unit-test.wsdl";>
+
<process name="pns:HelloWorld2">
<active>true</active>
<provide partnerLink="helloPartnerLink">
Modified:
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/MagicSession/Main.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/MagicSession/Main.wsdl?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/MagicSession/Main.wsdl
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-examples/src/examples/MagicSession/Main.wsdl
Wed Jul 26 11:24:40 2006
@@ -142,19 +142,19 @@
<wsdl:service name="MSMainService">
<wsdl:port name="MSMainPort" binding="tns:MSMainBinding">
- <soap:address
location="http://localhost:8080/axis2/processes/MSMainService"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/MSMainService"/>
</wsdl:port>
</wsdl:service>
<wsdl:service name="MSMainExecuteService">
<wsdl:port name="MSExecutePort" binding="tns:MSExecuteBinding">
- <soap:address
location="http://localhost:8080/axis2/processes/MSMainExecuteService"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/MSMainExecuteService"/>
</wsdl:port>
</wsdl:service>
<wsdl:service name="MSResponderService">
<wsdl:port name="MSResponderPort" binding="tns:MSResponderBinding">
- <soap:address
location="http://localhost:8080/axis2/processes/MSResponderService"/>
+ <soap:address
location="http://localhost:8080/pxe/processes/MSResponderService"/>
</wsdl:port>
</wsdl:service>
Modified:
incubator/ode/scratch/pxe-iapi/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
Wed Jul 26 11:24:40 2006
@@ -138,7 +138,7 @@
<phase name="PreDispatch"/>
<phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
<handler name="PXEAxisDispatcher"
- class="com.fs.pxe.axis.hooks.PXEAxisDispatcher">
+ class="com.fs.pxe.axis2.hooks.PXEAxisDispatcher">
<order phase="Dispatch"/>
</handler>
<handler name="InstanceDispatcher"
Modified:
incubator/ode/scratch/pxe-iapi/axis2/src/main/java/com/fs/pxe/axis2/DeploymentPoller.java
URL:
http://svn.apache.org/viewvc/incubator/ode/scratch/pxe-iapi/axis2/src/main/java/com/fs/pxe/axis2/DeploymentPoller.java?rev=425799&r1=425798&r2=425799&view=diff
==============================================================================
---
incubator/ode/scratch/pxe-iapi/axis2/src/main/java/com/fs/pxe/axis2/DeploymentPoller.java
(original)
+++
incubator/ode/scratch/pxe-iapi/axis2/src/main/java/com/fs/pxe/axis2/DeploymentPoller.java
Wed Jul 26 11:24:40 2006
@@ -78,8 +78,8 @@
if (checkIsNew(new File(file, "deploy.xml"))) {
try {
DeploymentUnit du = new DeploymentUnit(file, _pxeServer);
- _inspectedFiles.put(file.getName(), du);
du.deploy(false);
+ _inspectedFiles.put(file.getName(), du);
__log.info("Deployment of artifact " + file.getName() + "
successful.");
} catch (Exception e) {
__log.error("Deployment of " + file.getName() + " failed, aborting
for now.", e);
