You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ff...@apache.org on 2007/11/08 05:04:56 UTC
svn commit: r593004 - in /incubator/servicemix/trunk: ./
distributions/apache-servicemix/
distributions/apache-servicemix/src/main/release/examples/
distributions/apache-servicemix/src/main/release/examples/cluster/
distributions/apache-servicemix/src/...
Author: ffang
Date: Wed Nov 7 20:04:54 2007
New Revision: 593004
URL: http://svn.apache.org/viewvc?rev=593004&view=rev
Log:
Backporting fixes from 3.2 branch to main trunk
Modified:
incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/README.txt
incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt
incubator/servicemix/trunk/pom.xml
incubator/servicemix/trunk/samples/basic/README.txt
incubator/servicemix/trunk/samples/bridge/README.txt
incubator/servicemix/trunk/samples/camel/README.txt
incubator/servicemix/trunk/samples/cxf-wsdl-first/README.txt
incubator/servicemix/trunk/samples/cxf-wsdl-first/client.html
incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl
incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl
incubator/servicemix/trunk/samples/loan-broker/README.txt
incubator/servicemix/trunk/samples/servicemix-web/README.txt
incubator/servicemix/trunk/web/servicemix-web-console/src/main/webapp/index.jsp
incubator/servicemix/trunk/xdocs/index.xml
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml Wed Nov 7 20:04:54 2007
@@ -330,13 +330,6 @@
</artifactItem>
<artifactItem>
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-bpe</artifactId>
- <version>${servicemix-version}</version>
- <classifier>installer</classifier>
- <type>zip</type>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-drools</artifactId>
<version>${servicemix-version}</version>
<classifier>installer</classifier>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/README.txt Wed Nov 7 20:04:54 2007
@@ -21,4 +21,4 @@
This distribution contains several examples that are a good
starting point. You will find more informations on the
user guide:
- http://incubator.apache.org/servicemix/users-guide.html
+ http://servicemix.apache.org/users-guide.html
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/cluster/README.txt Wed Nov 7 20:04:54 2007
@@ -40,6 +40,6 @@
Just drop the test-file.xml in the poller/inbox directory.
It should be moved to the writer/outbox directory.
-See http://incubator.apache.org/servicemix/cluster.html
+See http://servicemix.apache.org/cluster.html
for more informations.
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/file-binding/README.txt Wed Nov 7 20:04:54 2007
@@ -36,4 +36,4 @@
see it appear in the outbox directory in a few seconds.
For more information see:
- http://incubator.apache.org/servicemix/file-binding.html
+ http://servicemix.apache.org/file-binding.html
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/loan-broker/README.txt Wed Nov 7 20:04:54 2007
@@ -33,4 +33,4 @@
For more information on this example please see
- http://incubator.apache.org/servicemix/loan-broker.html
+ http://servicemix.apache.org/loan-broker.html
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/rss-binding/README.txt Wed Nov 7 20:04:54 2007
@@ -26,4 +26,4 @@
../../bin/servicemix servicemix.xml
For more information see:
- http://incubator.apache.org/servicemix/rss-binding.html
+ http://servicemix.apache.org/rss-binding.html
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/vfs-binding/README.txt Wed Nov 7 20:04:54 2007
@@ -43,4 +43,4 @@
few seconds.
For more information see:
- http://incubator.apache.org/servicemix/vfs-binding.html
+ http://servicemix.apache.org/vfs-binding.html
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/ws-notification/README.txt Wed Nov 7 20:04:54 2007
@@ -44,5 +44,5 @@
WS-Notification demand publishing and filters will be added soon.
-See http://incubator.apache.org/servicemix/ws-notification-clustered.html
+See http://servicemix.apache.org/ws-notification-clustered.html
for more informations.
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/examples/wsn-http-binding/README.txt Wed Nov 7 20:04:54 2007
@@ -31,5 +31,5 @@
You can see the exposed service (and its WSDL) browsing at
http://localhost:8192/
-See http://incubator.apache.org/servicemix/ws-notification-http-binding.html
+See http://servicemix.apache.org/ws-notification-http-binding.html
for more informations.
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/release/hotdeploy/README.txt Wed Nov 7 20:04:54 2007
@@ -19,4 +19,4 @@
Just copy a JBI Service Assembly in this directory for it to deploy
For more information see
-http://incubator.apache.org/servicemix/Running
+http://servicemix.apache.org/Running
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Wed Nov 7 20:04:54 2007
@@ -36,7 +36,7 @@
ServiceMix is an open source ESB based on the Java Business
Integration framework - JSR-208
</description>
- <url>http://incubator.apache.org/servicemix</url>
+ <url>http://servicemix.apache.org/</url>
<prerequisites>
<maven>2.0.6</maven>
</prerequisites>
@@ -287,21 +287,28 @@
<module>distributions</module>
</modules>
</profile>
+
<profile>
- <id>release-environment</id>
- <activation>
- <property>
- <name>env</name>
- <value>release</value>
- </property>
- </activation>
+ <id>release</id>
<build>
<plugins>
- <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+ <!-- We want to deploy the artifact to a staging location for perusal -->
<plugin>
<inherited>true</inherited>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <altDeploymentRepository>${deploy.altRepository}</altDeploymentRepository>
+ <updateReleaseInfo>true</updateReleaseInfo>
+ </configuration>
+ </plugin>
+ <!-- We want to sign the artifact, the POM, and all attached artifacts -->
+ <plugin>
<artifactId>maven-gpg-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-alpha-4</version>
+ <configuration>
+ <passphrase>${gpg.passphrase}</passphrase>
+ </configuration>
<executions>
<execution>
<goals>
@@ -309,13 +316,30 @@
</goals>
</execution>
</executions>
- <configuration>
- <passphrase>${gpg.passphrase}</passphrase>
- </configuration>
</plugin>
- <!-- We want the JavaDoc JAR published with the release -->
- <plugin>
- <inherited>true</inherited>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>deploy</id>
+ <modules>
+ <module>build</module>
+ <module>core</module>
+ <module>common</module>
+ <module>tooling</module>
+ <module>archetypes</module>
+ <module>deployables</module>
+ <module>servicemix-itests</module>
+ <module>samples</module>
+ <module>web</module>
+ <module>platforms</module>
+ <module>distributions</module>
+ </modules>
+ <build>
+ <defaultGoal>deploy</defaultGoal>
+ <plugins>
+ <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.2</version>
<executions>
@@ -329,9 +353,8 @@
<source>1.5</source>
<attach>true</attach>
</configuration>
- </plugin>
- <!-- Force source JAR to be published -->
- <plugin>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.0.2</version>
@@ -348,8 +371,8 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
+ </profile>
+ <profile>
<id>setup.eclipse</id>
<modules>
<module>build</module>
Modified: incubator/servicemix/trunk/samples/basic/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/basic/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/basic/README.txt (original)
+++ incubator/servicemix/trunk/samples/basic/README.txt Wed Nov 7 20:04:54 2007
@@ -24,5 +24,5 @@
mvn jbi:embeddedServicemix
For more information on running this example please see:
- http://incubator.apache.org/servicemix/basic.html
+ http://servicemix.apache.org/basic.html
Modified: incubator/servicemix/trunk/samples/bridge/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/bridge/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/bridge/README.txt (original)
+++ incubator/servicemix/trunk/samples/bridge/README.txt Wed Nov 7 20:04:54 2007
@@ -26,12 +26,12 @@
in the root dir of this ditribution.
To start this sample, run:
- mvn install jbi:projectDeploy
+ mvn install jbi:projectDeploy -Dmaven.test.skip=true
You can then launch the client.html in your favorite browser
and send an HTTP request which will be transformed in a JMS
message.
For more information on running this example please see:
- http://incubator.apache.org/servicemix/bridge.html
+ http://servicemix.apache.org/bridge.html
Modified: incubator/servicemix/trunk/samples/camel/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/camel/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/camel/README.txt (original)
+++ incubator/servicemix/trunk/samples/camel/README.txt Wed Nov 7 20:04:54 2007
@@ -32,5 +32,5 @@
mvn install jbi:projectDeploy
For more information on running this example please see:
- http://incubator.apache.org/servicemix/camel-example.html
+ http://servicemix.apache.org/camel-example.html
Modified: incubator/servicemix/trunk/samples/cxf-wsdl-first/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/cxf-wsdl-first/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/cxf-wsdl-first/README.txt (original)
+++ incubator/servicemix/trunk/samples/cxf-wsdl-first/README.txt Wed Nov 7 20:04:54 2007
@@ -29,7 +29,7 @@
mvn install jbi:projectDeploy
You can browse the WSDL at
- http://localhost:8192/PersonService?wsdl
+ http://localhost:8092/PersonService?wsdl
You can also open the client.html page in a browser
to send a request to the service.
Modified: incubator/servicemix/trunk/samples/cxf-wsdl-first/client.html
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/cxf-wsdl-first/client.html?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/cxf-wsdl-first/client.html (original)
+++ incubator/servicemix/trunk/samples/cxf-wsdl-first/client.html Wed Nov 7 20:04:54 2007
@@ -21,7 +21,7 @@
<head>
<title>ServiceMix WSDL-First Example</title>
<script type="text/javascript">
-var urlToOpen = "http://localhost:8192/PersonService/"; //default URL to open
+var urlToOpen = "http://localhost:8092/PersonService/"; //default URL to open
function getHTTPObject() {
var xmlhttp = false;
Modified: incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl (original)
+++ incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfbc-su/src/main/resources/person.wsdl Wed Nov 7 20:04:54 2007
@@ -91,7 +91,7 @@
<wsdl:service name="PersonService">
<wsdl:port binding="tns:PersonSOAPBinding" name="soap">
- <soap:address location="http://localhost:8192/PersonService/" />
+ <soap:address location="http://localhost:8092/PersonService/" />
</wsdl:port>
</wsdl:service>
Modified: incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl (original)
+++ incubator/servicemix/trunk/samples/cxf-wsdl-first/wsdl-first-cxfse-su/src/main/resources/person.wsdl Wed Nov 7 20:04:54 2007
@@ -91,7 +91,7 @@
<wsdl:service name="PersonService">
<wsdl:port binding="tns:PersonSOAPBinding" name="soap">
- <soap:address location="http://localhost:8192/PersonService/" />
+ <soap:address location="http://localhost:8092/PersonService/" />
</wsdl:port>
</wsdl:service>
Modified: incubator/servicemix/trunk/samples/loan-broker/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/loan-broker/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/loan-broker/README.txt (original)
+++ incubator/servicemix/trunk/samples/loan-broker/README.txt Wed Nov 7 20:04:54 2007
@@ -40,4 +40,4 @@
ant run
For more information on this example please see
- http://incubator.apache.org/servicemix/loan-broker-bpel.html
+ http://servicemix.apache.org/loan-broker-bpel.html
Modified: incubator/servicemix/trunk/samples/servicemix-web/README.txt
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/samples/servicemix-web/README.txt?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/samples/servicemix-web/README.txt (original)
+++ incubator/servicemix/trunk/samples/servicemix-web/README.txt Wed Nov 7 20:04:54 2007
@@ -26,5 +26,5 @@
and
http://localhost:8080/servicemix-web/examples/
-See http://incubator.apache.org/servicemix/servicemix-web.html for more
+See http://servicemix.apache.org/servicemix-web.html for more
informations.
Modified: incubator/servicemix/trunk/web/servicemix-web-console/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/web/servicemix-web-console/src/main/webapp/index.jsp?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/web/servicemix-web-console/src/main/webapp/index.jsp (original)
+++ incubator/servicemix/trunk/web/servicemix-web-console/src/main/webapp/index.jsp Wed Nov 7 20:04:54 2007
@@ -27,7 +27,7 @@
</p>
<p>
-You can find more information about ServiceMix on the <a href="http://incubator.apache.org/servicemix/">Apache ServiceMix Site</a>
+You can find more information about ServiceMix on the <a href="http://servicemix.apache.org/">Apache ServiceMix Site</a>
</p>
</body>
</html>
Modified: incubator/servicemix/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/xdocs/index.xml?rev=593004&r1=593003&r2=593004&view=diff
==============================================================================
--- incubator/servicemix/trunk/xdocs/index.xml (original)
+++ incubator/servicemix/trunk/xdocs/index.xml Wed Nov 7 20:04:54 2007
@@ -17,7 +17,7 @@
limitations under the License.
-->
-<document url="http://incubator.apache.org/servicemix/index.xml">
+<document url="http://servicemix.apache.org/index.xml">
<properties>
<title>ServiceMix</title>
</properties>