Author: lhein
Date: Fri Mar 25 14:31:34 2011
New Revision: 1085401
URL: http://svn.apache.org/viewvc?rev=1085401&view=rev
Log:
started reworking the smx4 build (see SMX4-778)
Added:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
- copied, changed from r1080901,
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties
- copied, changed from r1080901,
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties
Removed:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Copied:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties
(from r1080901,
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties)
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties?p2=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/custom.properties&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/custom.properties&r1=1080901&r2=1085401&rev=1085401&view=diff
==============================================================================
(empty)
Copied:
servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties
(from r1080901,
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties)
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties?p2=servicemix/smx4/features/trunk/assembly/src/main/distribution/text/etc/jre.properties&p1=servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/etc/jre.properties&r1=1080901&r2=1085401&rev=1085401&view=diff
==============================================================================
(empty)
Modified: servicemix/smx4/features/trunk/examples/itests/tests/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/pom.xml?rev=1085401&r1=1085400&r2=1085401&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/examples/itests/tests/pom.xml (original)
+++ servicemix/smx4/features/trunk/examples/itests/tests/pom.xml Fri Mar 25
14:31:34 2011
@@ -81,10 +81,6 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jetty</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.neethi</artifactId>
</dependency>
<dependency>
@@ -446,6 +442,58 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.opensaml</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-continuation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-jmx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm</artifactId>
+ </dependency>
</dependencies>
<build>
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java?rev=1085401&r1=1085400&r2=1085401&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/CXFNMRIntegrationTest.java
Fri Mar 25 14:31:34 2011
@@ -16,33 +16,15 @@
*/
package org.apache.servicemix.examples;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.jar.Manifest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.List;
-
-import javax.xml.transform.Source;
-
-import org.apache.cxf.Bus;
import org.apache.servicemix.examples.cxf.HelloWorld;
-import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.Exchange;
import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.Status;
import org.apache.servicemix.platform.testing.support.AbstractIntegrationTest;
-import org.springframework.osgi.test.platform.OsgiPlatform;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import java.util.Properties;
+import java.util.jar.Manifest;
+
public class CXFNMRIntegrationTest extends AbstractIntegrationTest {
private Properties dependencies;
@@ -102,7 +84,19 @@ public class CXFNMRIntegrationTest exten
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xerces"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xalan"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty"),
+ //getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty"),
+ getBundle("org.eclipse.jetty", "jetty-util"),
+ getBundle("org.eclipse.jetty", "jetty-io"),
+ getBundle("org.eclipse.jetty", "jetty-http"),
+ getBundle("org.eclipse.jetty", "jetty-client"),
+ getBundle("org.eclipse.jetty", "jetty-continuation"),
+ getBundle("org.eclipse.jetty", "jetty-jmx"),
+ getBundle("org.eclipse.jetty", "jetty-server"),
+ getBundle("org.eclipse.jetty", "jetty-security"),
+ getBundle("org.eclipse.jetty", "jetty-servlet"),
+ getBundle("org.eclipse.jetty", "jetty-servlets"),
+ getBundle("org.eclipse.jetty", "jetty-xml"),
+ getBundle("org.eclipse.jetty", "jetty-webapp"),
getBundle("javax.mail", "mail"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.abdera"),
Modified:
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java?rev=1085401&r1=1085400&r2=1085401&view=diff
==============================================================================
---
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
(original)
+++
servicemix/smx4/features/trunk/examples/itests/tests/src/test/java/org/apache/servicemix/examples/IntegrationTest.java
Fri Mar 25 14:31:34 2011
@@ -16,38 +16,27 @@
*/
package org.apache.servicemix.examples;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.net.HttpURLConnection;
-import java.io.OutputStream;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.jar.Manifest;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.List;
-import javax.activation.DataHandler;
-import javax.xml.transform.Source;
-import javax.xml.ws.Holder;
+import com.sun.tools.javac.resources.version;
import org.apache.cxf.Bus;
import org.apache.servicemix.examples.cxf.HelloWorld;
import org.apache.servicemix.jbi.jaxp.StringSource;
-import org.apache.servicemix.nmr.api.Channel;
-import org.apache.servicemix.nmr.api.Endpoint;
-import org.apache.servicemix.nmr.api.Exchange;
-import org.apache.servicemix.nmr.api.NMR;
-import org.apache.servicemix.nmr.api.Pattern;
-import org.apache.servicemix.nmr.api.Status;
+import org.apache.servicemix.nmr.api.*;
import org.apache.servicemix.platform.testing.support.AbstractIntegrationTest;
import org.apache.servicemix.util.FileUtil;
-import org.springframework.osgi.test.platform.OsgiPlatform;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import javax.activation.DataHandler;
+import javax.xml.ws.Holder;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Properties;
+import java.util.jar.Manifest;
+
public class IntegrationTest extends AbstractIntegrationTest {
private Properties dependencies;
@@ -130,7 +119,19 @@ public class IntegrationTest extends Abs
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xerces"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xalan"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.xmlsec"),
- getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty"),
+ //getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.jetty"),
+ getBundle("org.eclipse.jetty", "jetty-util"),
+ getBundle("org.eclipse.jetty", "jetty-io"),
+ getBundle("org.eclipse.jetty", "jetty-http"),
+ getBundle("org.eclipse.jetty", "jetty-client"),
+ getBundle("org.eclipse.jetty", "jetty-continuation"),
+ getBundle("org.eclipse.jetty", "jetty-jmx"),
+ getBundle("org.eclipse.jetty", "jetty-server"),
+ getBundle("org.eclipse.jetty", "jetty-security"),
+ getBundle("org.eclipse.jetty", "jetty-servlet"),
+ getBundle("org.eclipse.jetty", "jetty-servlets"),
+ getBundle("org.eclipse.jetty", "jetty-xml"),
+ getBundle("org.eclipse.jetty", "jetty-webapp"),
getBundle("javax.mail", "mail"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-codec"),
getBundle("org.apache.servicemix.bundles",
"org.apache.servicemix.bundles.commons-httpclient"),
