servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r597450 - in /servicemix/branches/servicemix-4.0: ./ activemq/ apache-servicemix/ apache-servicemix/src/main/descriptors/ bundles/cxf/ bundles/jaxb-api/ bundles/jaxb-impl/ bundles/jaxws-api/ bundles/openejb/ bundles/openjpa/ bundles/wsdl4j/...
Date Thu, 22 Nov 2007 16:27:24 GMT
Author: gnodet
Date: Thu Nov 22 08:27:22 2007
New Revision: 597450

URL: http://svn.apache.org/viewvc?rev=597450&view=rev
Log:
Improve openejb integration

Added:
    servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/openejb/
    servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/openejb/MANIFEST.MF
      - copied, changed from r596355, servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
    servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/EndpointRegistryImplTest.java
Modified:
    servicemix/branches/servicemix-4.0/activemq/   (props changed)
    servicemix/branches/servicemix-4.0/activemq/pom.xml
    servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
    servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
    servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
    servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml
    servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml
    servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml
    servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml
    servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml
    servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml
    servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml
    servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml
    servicemix/branches/servicemix-4.0/itests/ejbjar/pom.xml
    servicemix/branches/servicemix-4.0/itests/tests/   (props changed)
    servicemix/branches/servicemix-4.0/itests/tests/pom.xml
    servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java
    servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
    servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java
    servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java
    servicemix/branches/servicemix-4.0/openejb/   (props changed)
    servicemix/branches/servicemix-4.0/openejb/pom.xml
    servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/OsgiWsRegistry.java
    servicemix/branches/servicemix-4.0/openejb/src/test/java/org/apache/servicemix/openejb/Test.java
    servicemix/branches/servicemix-4.0/pom.xml

Propchange: servicemix/branches/servicemix-4.0/activemq/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 22 08:27:22 2007
@@ -0,0 +1,4 @@
+target
+*.iml
+*.ipr
+*.iws

Modified: servicemix/branches/servicemix-4.0/activemq/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/activemq/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/activemq/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/activemq/pom.xml Thu Nov 22 08:27:22 2007
@@ -50,7 +50,6 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>${activemq.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>

Modified: servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Thu Nov 22 08:27:22 2007
@@ -300,6 +300,10 @@
             <groupId>org.apache.xbean</groupId>
             <artifactId>xbean-finder</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/unix-bin.xml Thu Nov 22 08:27:22 2007
@@ -221,6 +221,7 @@
                 <include>org.apache.xbean:xbean-reflect</include>
                 <include>org.ops4j.pax.web:pax-web-service</include>
                 <include>org.apache.servicemix.openejb:org.apache.servicemix.openejb</include>
+                <include>org.apache.ws.commons.schema:XmlSchema</include>
             </includes>
         </dependencySet>
 

Modified: servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/src/main/descriptors/windows-bin.xml Thu Nov 22 08:27:22 2007
@@ -150,6 +150,7 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
                 <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
                 <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
             </includes>
@@ -188,6 +189,39 @@
                 <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
                 <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
                 <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+            </includes>
+        </dependencySet>
+
+        <!-- OpenEJB -->
+        <dependencySet>
+            <outputDirectory>/system</outputDirectory>
+            <unpack>false</unpack>
+            <scope>runtime</scope>
+            <includes>
+                <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jacc_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-interceptor_3.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-ejb_3.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-jpa_3.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-ws-metadata_2.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-saaj_1.1_spec</include>
+                <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.asm</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cxf</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-api</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxb-impl</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.jaxws-api</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openejb</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.openjpa</include>
+                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.wsdl4j</include>
+                <include>org.apache.xbean:xbean-naming</include>
+                <include>org.apache.xbean:xbean-finder</include>
+                <include>org.apache.xbean:xbean-reflect</include>
+                <include>org.ops4j.pax.web:pax-web-service</include>
+                <include>org.apache.servicemix.openejb:org.apache.servicemix.openejb</include>
+                <include>org.apache.ws.commons.schema:XmlSchema</include>
             </includes>
         </dependencySet>
 

Modified: servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/cxf/pom.xml Thu Nov 22 08:27:22 2007
@@ -47,14 +47,23 @@
         <servicemix.osgi.import.pkg>
             com.ibm*;resolution:=optional,
             com.sun*;resolution:=optional,
+            javanet.staxutils*;resolution:=optional,
+            javax.jms*;resolution:=optional,
             junit.framework*;resolution:=optional,
+            org.apache.axiom*;resolution:=optional,
             org.apache.commons.lang*;resolution:=optional,
             org.apache.log4j*;resolution:=optional,
             org.apache.tools.ant*;resolution:=optional,
             org.apache.velocity*;resolution:=optional,
+            org.apache.xmlbeans*;resolution:=optional,
+            org.apache.ws.security*;resolution:=optional,
+            org.codehaus.jra*;resolution:=optional,
+            org.jdom*;resolution:=optional,
             org.junit*;resolution:=optional,
             org.mortbay*;resolution:=optional,
+            org.mozilla.javascript*;resolution:=optional,
             org.springframework*;resolution:=optional,
+            sun.misc*;resolution:=optional,
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.private.pkg>
@@ -62,7 +71,6 @@
             org.apache.xml.resolver*,
             org.apache.neethi*,
             org.xmlsoap.schemas.wsdl.http,
-            schema.*
         </servicemix.osgi.private.pkg>
     </properties>
 

Modified: servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/jaxb-api/pom.xml Thu Nov 22 08:27:22 2007
@@ -39,7 +39,7 @@
 
     <properties>
         <pkgArtifactId>jaxb-api</pkgArtifactId>
-        <pkgVersion>2.0</pkgVersion>
+        <pkgVersion>${jaxb.api.version}</pkgVersion>
         <pomVersion>4.0-SNAPSHOT</pomVersion>
         <servicemix.osgi.export.pkg>javax.xml.bind*</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>javax.xml.stream*;resolution:=optional,*</servicemix.osgi.import.pkg>
@@ -47,19 +47,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.xml</groupId>
+            <groupId>javax.xml.bind</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml</groupId>
-                    <artifactId>jsr173</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>javax.activation</groupId>
-                    <artifactId>activation</artifactId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/jaxb-impl/pom.xml Thu Nov 22 08:27:22 2007
@@ -39,7 +39,7 @@
 
     <properties>
         <pkgArtifactId>jaxb-impl</pkgArtifactId>
-        <pkgVersion>2.0.3</pkgVersion>
+        <pkgVersion>${jaxb.impl.version}</pkgVersion>
         <pomVersion>4.0-SNAPSHOT</pomVersion>
         <servicemix.osgi.export.pkg>
             com.sun.xml.bind*,
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/jaxws-api/pom.xml Thu Nov 22 08:27:22 2007
@@ -53,6 +53,7 @@
             <groupId>javax.xml.ws</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
             <exclusions>
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>

Modified: servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml Thu Nov 22 08:27:22 2007
@@ -39,7 +39,7 @@
 
     <properties>
         <pkgArtifactId>openejb</pkgArtifactId>
-        <pkgVersion>3.0.0-SNAPSHOT</pkgVersion>
+        <pkgVersion>${openejb.version}</pkgVersion>
         <pomVersion>4.0-SNAPSHOT</pomVersion>
 		<servicemix.osgi.export.pkg>org.apache.openejb</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
@@ -69,46 +69,67 @@
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-core</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-client</artifactId>
+            <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-javaagent</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-jee</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-loader</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-cxf</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-http</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-server</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-ejbd</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openejb</groupId>
             <artifactId>openejb-webservices</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.swizzle</groupId>
+            <artifactId>swizzle-stream</artifactId>
+            <version>1.0.1</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -132,8 +153,8 @@
                         <Export-Package>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</Export-Package>
                         <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
                         <!-- Needed for jaxb annotations classes -->
-                        <DynamicImport-Package>javax.xml.bind.annotation.*</DynamicImport-Package>
-                        <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
+                        <Private-Package>${servicemix.osgi.private.pkg},org.codehaus.swizzle*,META-INF*</Private-Package>
                     </instructions>
                 </configuration>
             </plugin>

Modified: servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/openjpa/pom.xml Thu Nov 22 08:27:22 2007
@@ -39,7 +39,7 @@
 
     <properties>
         <pkgArtifactId>openjpa</pkgArtifactId>
-        <pkgVersion>1.0.0</pkgVersion>
+        <pkgVersion>${openjpa.version}</pkgVersion>
         <pomVersion>4.0-SNAPSHOT</pomVersion>
 		<servicemix.osgi.export.pkg>org.apache.openjpa</servicemix.osgi.export.pkg>
         <servicemix.osgi.import.pkg>
@@ -62,36 +62,43 @@
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-jdbc-5</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-kernel-5</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-lib</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa-persistence-jdbc</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/wsdl4j/pom.xml Thu Nov 22 08:27:22 2007
@@ -50,6 +50,7 @@
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/xstream/pom.xml Thu Nov 22 08:27:22 2007
@@ -63,6 +63,7 @@
             <groupId>com.thoughtworks.xstream</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 

Modified: servicemix/branches/servicemix-4.0/itests/ejbjar/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/ejbjar/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/ejbjar/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/itests/ejbjar/pom.xml Thu Nov 22 08:27:22 2007
@@ -57,6 +57,7 @@
                         <Bundle-Name>${pom.name}</Bundle-Name>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>*</Import-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
                         <Export-Package>org.apache.servicemix*</Export-Package>
                     </instructions>
                 </configuration>

Propchange: servicemix/branches/servicemix-4.0/itests/tests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 22 08:27:22 2007
@@ -3,3 +3,4 @@
 *.ipr
 *.iws
 eclipse_config
+data

Modified: servicemix/branches/servicemix-4.0/itests/tests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/pom.xml Thu Nov 22 08:27:22 2007
@@ -441,16 +441,19 @@
             <groupId>org.springframework.osgi</groupId>
             <artifactId>junit.osgi</artifactId>
             <version>3.8.2-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.osgi</groupId>
             <artifactId>asm.osgi</artifactId>
             <version>2.2.3-SNAPSHOT</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <version>0.9.0-SNAPSHOT</version>
+            <scope>provided</scope>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.felix</groupId>
@@ -469,22 +472,32 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.confman</groupId>
             <artifactId>pax-confman-propsloader</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-service</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -516,11 +529,6 @@
                     <execution>
                         <id>default</id>
                         <phase>test</phase>
-                        <goals></goals>
-                    </execution>
-                    <execution>
-                        <id>integration-test</id>
-                        <phase>integration-test</phase>
                         <goals>
                             <goal>test</goal>
                         </goals>

Modified: servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java Thu Nov 22 08:27:22 2007
@@ -16,10 +16,13 @@
  */
 package org.apache.servicemix.openejb;
 
+import java.lang.annotation.Annotation;
+import java.net.URL;
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.openejb.config.ReadDescriptors;
 import org.apache.servicemix.AbstractIntegrationTest;
 
 public class OpenEjbIntegrationTest extends AbstractIntegrationTest {
@@ -38,7 +41,7 @@
 	 * of the entire manifest...
 	 */
 	protected String getManifestLocation() {
-		return "classpath:org/apache/servicemix/MANIFEST.MF";
+		return "classpath:org/apache/servicemix/openejb/MANIFEST.MF";
 	}
 
     /**
@@ -60,6 +63,7 @@
             getBundle("org.apache.xbean", "xbean-finder"),
             getBundle("org.apache.xbean", "xbean-naming"),
             getBundle("org.apache.xbean", "xbean-reflect"),
+            getBundle("org.apache.ws.commons.schema", "XmlSchema"),
             getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"),
             getBundle("org.apache.geronimo.specs", "geronimo-ejb_3.0_spec"),
@@ -97,25 +101,22 @@
 	 * context via the 'getBundleContext' operation
 	 */
 	public void testOSGiStartedOk() throws Exception {
-        /*
-        Thread.sleep(2000);
-        System.out.println("Installing transaction manager");
-        installBundle("org.apache.servicemix", "org.apache.servicemix.transaction", null, "jar");
-        Thread.sleep(2000);
-        System.out.println("Installing http service");
-        installBundle("org.ops4j.pax.web", "pax-web-service", null, "jar");
-        */
-        Thread.sleep(2000);
-        System.out.println("Installing openejb");
-        installBundle("org.apache.servicemix.openejb", "org.apache.servicemix.openejb", null, "jar");
-        Thread.sleep(2000);
-        System.out.println("Checking that EJB bundle is started");
-        checkBundleStarted("org.apache.servicemix.openejb");
-        Thread.sleep(2000);
-        System.out.println("Installing ejbjar bundle");
-        installBundle("org.apache.servicemix.itests", "org.apache.servicemix.itests.ejbjar", null, "jar");
-        System.out.println("ejbjar bundle installed");
-        Thread.sleep(2000);
+        try {
+            Thread.sleep(2000);
+            System.out.println("Installing openejb");
+            installBundle("org.apache.servicemix.openejb", "org.apache.servicemix.openejb", null, "jar");
+            Thread.sleep(2000);
+            System.out.println("Checking that EJB bundle is started");
+            checkBundleStarted("org.apache.servicemix.openejb");
+            Thread.sleep(2000);
+            System.out.println("Installing ejbjar bundle");
+            installBundle("org.apache.servicemix.itests", "org.apache.servicemix.itests.ejbjar", null, "jar");
+            System.out.println("ejbjar bundle installed");
+            Thread.sleep(2000);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new Exception(e.getMessage()) ;
+        }
     }
 
 }

Modified: servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF Thu Nov 22 08:27:22 2007
@@ -28,4 +28,5 @@
  org.apache.servicemix.nmr.api,
  org.apache.servicemix.nmr.core,
  javax.jms
+DynamicImport-Package: *
 

Copied: servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/openejb/MANIFEST.MF (from r596355, servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/openejb/MANIFEST.MF?p2=servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/openejb/MANIFEST.MF&p1=servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF&r1=596355&r2=597450&rev=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/MANIFEST.MF (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/src/test/resources/org/apache/servicemix/openejb/MANIFEST.MF Thu Nov 22 08:27:22 2007
@@ -27,5 +27,8 @@
  org.springframework.osgi.internal.util.concurrent,
  org.apache.servicemix.nmr.api,
  org.apache.servicemix.nmr.core,
- javax.jms
+ javax.jms,
+ javax.xml.bind,
+ javax.xml.bind.annotation
+DynamicImport-Package: *
 

Modified: servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java (original)
+++ servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/EndpointRegistryImpl.java Thu Nov 22 08:27:22 2007
@@ -42,6 +42,7 @@
 
     private NMR nmr;
     private Map<Endpoint, InternalEndpoint> endpoints = new ConcurrentHashMap<Endpoint, InternalEndpoint>();
+    private Map<InternalEndpoint, Endpoint> wrappers = new ConcurrentHashMap<InternalEndpoint, Endpoint>();
     private ServiceRegistry<InternalEndpoint> registry = new ServiceRegistryImpl<InternalEndpoint>();
 
     public EndpointRegistryImpl() {
@@ -79,6 +80,7 @@
         ChannelImpl channel = new ChannelImpl(wrapper, executor, nmr);
         wrapper.setChannel(channel);
         endpoints.put(endpoint, wrapper);
+        wrappers.put(wrapper, endpoint);
         registry.register(wrapper, properties);
     }
 
@@ -89,7 +91,15 @@
      * @param endpoint the endpoint to unregister
      */
     public void unregister(Endpoint endpoint, Map<String, ?> properties) {
-        InternalEndpoint wrapper = endpoints.remove(endpoint);
+        InternalEndpoint wrapper;
+        if (endpoint instanceof InternalEndpoint) {
+            wrapper = (InternalEndpoint) endpoint;
+            endpoint = wrappers.remove(wrapper);
+            endpoints.remove(endpoint);
+        } else {
+            wrapper = endpoints.remove(endpoint);
+            wrappers.remove(wrapper);
+        }
         registry.unregister(wrapper, properties);
     }
 

Modified: servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java (original)
+++ servicemix/branches/servicemix-4.0/nmr/core/src/main/java/org/apache/servicemix/nmr/core/ServiceRegistryImpl.java Thu Nov 22 08:27:22 2007
@@ -34,10 +34,12 @@
     private Map<T, Map<String, ?>> registry = new ConcurrentHashMap<T, Map<String, ?>>();
 
     public void register(T service, Map<String, ?> properties) {
+        assert service != null : "service should not be null";
         registry.put(service, properties);
     }                                                                                                                                   
 
     public void unregister(T service, Map<String, ?> properties) {
+        assert service != null : "service should not be null";
         registry.remove(service);
     }
 

Added: servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/EndpointRegistryImplTest.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/EndpointRegistryImplTest.java?rev=597450&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/EndpointRegistryImplTest.java (added)
+++ servicemix/branches/servicemix-4.0/nmr/core/src/test/java/org/apache/servicemix/nmr/core/EndpointRegistryImplTest.java Thu Nov 22 08:27:22 2007
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.servicemix.nmr.core;
+
+import java.util.List;
+
+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.Reference;
+import org.apache.servicemix.nmr.api.ServiceMixException;
+import org.apache.servicemix.nmr.api.internal.InternalEndpoint;
+import org.apache.servicemix.nmr.api.service.ServiceHelper;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Test;
+
+public class EndpointRegistryImplTest {
+
+    private EndpointRegistryImpl registry;
+
+    @Before
+    public void setUp() {
+        registry = new EndpointRegistryImpl();
+    }
+
+    @Test
+    public void testUnregister() {
+        Endpoint endpoint = new DummyEndpoint();
+        registry.register(endpoint, ServiceHelper.createMap(Endpoint.NAME, "id"));
+        Reference ref = registry.lookup(ServiceHelper.createMap(Endpoint.NAME, "id"));
+        assertNotNull(ref);
+        assertTrue(ref instanceof ReferenceImpl);
+        List<InternalEndpoint> endpoints = ((ReferenceImpl) ref).getEndpoints();
+        assertNotNull(endpoints);
+        assertEquals(1, endpoints.size());
+        registry.unregister(endpoint, null);
+        try {
+            registry.lookup(ServiceHelper.createMap(Endpoint.NAME, "id"));
+        } catch (ServiceMixException e) {
+            // ok
+        }
+    }
+
+    protected static class DummyEndpoint implements Endpoint {
+        public void setChannel(Channel channel) {
+        }
+        public void process(Exchange exchange) {
+        }
+    }
+}

Propchange: servicemix/branches/servicemix-4.0/openejb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov 22 08:27:22 2007
@@ -0,0 +1,4 @@
+target
+*.iml
+*.ipr
+*.iws

Modified: servicemix/branches/servicemix-4.0/openejb/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/openejb/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/openejb/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/openejb/pom.xml Thu Nov 22 08:27:22 2007
@@ -37,6 +37,22 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.cxf</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxws-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.openejb</artifactId>
         </dependency>
         <dependency>
@@ -45,7 +61,23 @@
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.cxf</artifactId>
+            <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -55,18 +87,78 @@
             <groupId>org.springframework.osgi</groupId>
             <artifactId>spring-osgi-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.ops4j.pax.web</groupId>
             <artifactId>pax-web-service</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_3.0_spec</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jacc_1.1_spec</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.components</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-naming</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-reflect</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.schema</groupId>
+            <artifactId>XmlSchema</artifactId>
+            <scope>runtime</scope>
         </dependency>
+
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
@@ -125,26 +217,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>asm.osgi</artifactId>
-            <version>2.2.3-SNAPSHOT</version>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.asm</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
-            <version>1.2.15</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.sun.jdmk</groupId>
-                    <artifactId>jmxtools</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.jmx</groupId>
-                    <artifactId>jmxri</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 
@@ -162,7 +242,7 @@
                             *
                         </Import-Package>
                         <!-- Needed for jaxb annotations classes -->
-                        <DynamicImport-Package>javax.xml.bind.annotation.*</DynamicImport-Package>
+                        <DynamicImport-Package>*</DynamicImport-Package>
                         <Export-Package>${pom.artifactId}*</Export-Package>
                         <Private-Package></Private-Package>
                         <Spring-Context>*;publish-context:=false</Spring-Context>

Modified: servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/OsgiWsRegistry.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/OsgiWsRegistry.java?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/OsgiWsRegistry.java (original)
+++ servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/OsgiWsRegistry.java Thu Nov 22 08:27:22 2007
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.servicemix.openejb;
 
 import java.util.Arrays;
@@ -23,13 +39,14 @@
     }
 
     public List<String> setWsContainer(String virtualHost, String contextRoot, String servletName, HttpListener wsContainer) throws Exception {
+        // TODO: implement
         System.err.println("setWsContainer");
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
+        return null;
     }
 
     public void clearWsContainer(String virtualHost, String contextRoot, String servletName) {
+        // TODO: implement
         System.err.println("clearWsContainer");
-        //To change body of implemented methods use File | Settings | File Templates.
     }
 
     public List<String> addWsContainer(String path, HttpListener httpListener, String virtualHost, String realmName, String transportGuarantee, String authMethod, ClassLoader classLoader) throws Exception {
@@ -41,7 +58,8 @@
 
         httpService.registerServlet(path, new WsServlet(httpListener), null, httpService.createDefaultHttpContext());
 
-        return Arrays.asList("http://localhost" + path);  //To change body of implemented methods use File | Settings | File Templates.
+        // TODO: return a correct list
+        return Arrays.asList("http://localhost" + path);
     }
 
     public void removeWsContainer(String path) {

Modified: servicemix/branches/servicemix-4.0/openejb/src/test/java/org/apache/servicemix/openejb/Test.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/openejb/src/test/java/org/apache/servicemix/openejb/Test.java?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/openejb/src/test/java/org/apache/servicemix/openejb/Test.java (original)
+++ servicemix/branches/servicemix-4.0/openejb/src/test/java/org/apache/servicemix/openejb/Test.java Thu Nov 22 08:27:22 2007
@@ -3,8 +3,19 @@
 import java.io.File;
 import java.net.URL;
 import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Dictionary;
+
+import javax.servlet.Servlet;
+import javax.servlet.ServletException;
 
 import junit.framework.TestCase;
+import org.apache.openejb.server.httpd.HttpListener;
+import org.apache.openejb.server.webservices.WsRegistry;
+import org.osgi.service.http.HttpService;
+import org.osgi.service.http.HttpContext;
+import org.osgi.service.http.NamespaceException;
 
 /**
  * Created by IntelliJ IDEA.
@@ -18,7 +29,22 @@
     public void test() throws Exception {
         System.setProperty("openejb.deployments.classpath", "false");
 
+        final List<String> servlets = new ArrayList<String>();
+        HttpService http = new HttpService() {
+            public void registerServlet(String s, Servlet servlet, Dictionary dictionary, HttpContext httpContext) throws ServletException, NamespaceException {
+                servlets.add(s);
+            }
+            public void registerResources(String s, String s1, HttpContext httpContext) throws NamespaceException {
+            }
+            public void unregister(String s) {
+            }
+            public HttpContext createDefaultHttpContext() {
+                return null;
+            }
+        };
+
         OsgiWsRegistry registry = new OsgiWsRegistry();
+        registry.setHttpService(http);;
         OpenEjbFactory factory = new OpenEjbFactory();
         factory.setWsRegistry(registry);
         factory.init();
@@ -28,6 +54,8 @@
         URLClassLoader cl = new URLClassLoader(new URL[] {url}, Test.class.getClassLoader());
         System.out.println(url.toString());
         new Deployer().deploy(cl, url.toString());
+
+        assertEquals(1, servlets.size());
     }
 
 }

Modified: servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/pom.xml?rev=597450&r1=597449&r2=597450&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/pom.xml Thu Nov 22 08:27:22 2007
@@ -75,6 +75,10 @@
         <acegi.version>1.0.0</acegi.version>
         <cxf.version>2.0.2-incubator</cxf.version>
         <xbean.version>3.3-SNAPSHOT</xbean.version>
+        <jaxb.api.version>2.0</jaxb.api.version>
+        <jaxb.impl.version>2.0.5</jaxb.impl.version>
+        <openejb.version>3.0.0-SNAPSHOT</openejb.version>
+        <openjpa.version>1.0.0</openjpa.version>
     </properties>
 
     <repositories>
@@ -404,6 +408,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+                <version>2.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_3.0_spec</artifactId>
                 <version>1.1.1-SNAPSHOT</version>
             </dependency>
@@ -662,6 +671,36 @@
                 <groupId>org.ops4j.pax.web</groupId>
                 <artifactId>pax-web-service</artifactId>
                 <version>0.2.1</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+                <version>${jaxb.api.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml</groupId>
+                        <artifactId>jsr173</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>${jaxb.impl.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-core</artifactId>
+                <version>${activemq.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.ws.commons.schema</groupId>
+                <artifactId>XmlSchema</artifactId>
+                <version>SNAPSHOT</version>
             </dependency>
         </dependencies>
     </dependencyManagement>



Mime
View raw message