You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/02/17 09:56:12 UTC
svn commit: r378460 - in
/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web:
project.properties project.xml
src/test/java/org/apache/servicemix/web/JettyServer.java
src/webapp/WEB-INF/activemq.xml
Author: gnodet
Date: Fri Feb 17 00:56:09 2006
New Revision: 378460
URL: http://svn.apache.org/viewcvs?rev=378460&view=rev
Log:
Fix servicemix-web web app
Modified:
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/test/java/org/apache/servicemix/web/JettyServer.java
incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/webapp/WEB-INF/activemq.xml
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties?rev=378460&r1=378459&r2=378460&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.properties Fri Feb 17 00:56:09 2006
@@ -40,3 +40,7 @@
commons_beanutils_version=1.7.0
quartz_version=1.5.1
mx4j_version=3.0.1
+backport_util_concurrent_version=2.1
+activeio_version=2.1
+derby_version=10.1.1.0
+
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml?rev=378460&r1=378459&r2=378460&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/project.xml Fri Feb 17 00:56:09 2006
@@ -42,6 +42,22 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>${backport_util_concurrent_version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby_version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>incubator-activemq</groupId>
@@ -52,6 +68,14 @@
</properties>
</dependency>
<dependency>
+ <groupId>activeio</groupId>
+ <artifactId>activeio</artifactId>
+ <version>${activeio_version}</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
<groupId>incubator-activemq</groupId>
<artifactId>activemq-ra</artifactId>
<version>${activemq_version}</version>
@@ -173,4 +197,38 @@
</dependencies>
+ <build>
+ <sourceDirectory>src/main/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
+
+ <integrationUnitTestSourceDirectory/>
+ <aspectSourceDirectory/>
+
+ <unitTest>
+ <resources>
+ <resource>
+ <directory>src/test/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <includes>
+ <include>**/*Test.*</include>
+ </includes>
+ <excludes>
+ <!-- exclude abstract tests -->
+ <exclude>**/Abstract*Test.*</exclude>
+ </excludes>
+ </unitTest>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/test/java/org/apache/servicemix/web/JettyServer.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/test/java/org/apache/servicemix/web/JettyServer.java?rev=378460&r1=378459&r2=378460&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/test/java/org/apache/servicemix/web/JettyServer.java (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/test/java/org/apache/servicemix/web/JettyServer.java Fri Feb 17 00:56:09 2006
@@ -17,7 +17,10 @@
*
**/
-import org.mortbay.http.SocketListener;
+import org.mortbay.jetty.bio.SocketConnector;
+import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.jetty.Connector;
+import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
/**
@@ -41,10 +44,13 @@
}
System.out.println("Starting Web Server on port: " + port);
Server server = new Server();
- SocketListener listener = new SocketListener();
- listener.setPort(port);
- server.addWebApplication(WEBAPP_CTX, WEBAPP_DIR);
- server.addListener(listener);
+ SocketConnector connector = new SocketConnector();
+ connector.setPort(port);
+ WebAppContext webapp = new WebAppContext();
+ webapp.setContextPath(WEBAPP_CTX);
+ webapp.setResourceBase(WEBAPP_DIR);
+ server.setHandlers(new Handler[] { webapp });
+ server.setConnectors(new Connector[] { connector });
server.start();
}
}
Modified: incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/webapp/WEB-INF/activemq.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/webapp/WEB-INF/activemq.xml?rev=378460&r1=378459&r2=378460&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/webapp/WEB-INF/activemq.xml (original)
+++ incubator/servicemix/trunk/servicemix-assembly/src/main/release/examples/servicemix-web/src/webapp/WEB-INF/activemq.xml Fri Feb 17 00:56:09 2006
@@ -12,7 +12,7 @@
</persistenceAdapter>
<transportConnectors>
- <transportConnector uri="tcp://localhost:61616" discoveryUri="multicast://default"/>
+ <transportConnector uri="tcp://localhost:61636" discoveryUri="multicast://default"/>
</transportConnectors>
<networkConnectors>