servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r596581 - in /servicemix/branches/servicemix-4.0: ./ apache-servicemix/ apache-servicemix/src/main/descriptors/ bundles/openejb/ itests/tests/ itests/tests/src/test/java/org/apache/servicemix/ itests/tests/src/test/java/org/apache/servicemi...
Date Tue, 20 Nov 2007 09:37:32 GMT
Author: gnodet
Date: Tue Nov 20 01:37:30 2007
New Revision: 596581

URL: http://svn.apache.org/viewvc?rev=596581&view=rev
Log:
Fix a things

Added:
    servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/
    servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java
      - copied, changed from r596355, servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/EjbIntegrationTest.java
Removed:
    servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/EjbIntegrationTest.java
Modified:
    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/bundles/openejb/pom.xml
    servicemix/branches/servicemix-4.0/itests/tests/pom.xml
    servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
    servicemix/branches/servicemix-4.0/openejb/pom.xml
    servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/Deployer.java
    servicemix/branches/servicemix-4.0/pom.xml

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=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/apache-servicemix/pom.xml Tue Nov 20 01:37:30 2007
@@ -203,7 +203,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -220,42 +219,22 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-            <version>0.9.7-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-service</artifactId>
-            <version>0.9.7-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
-            <version>1.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jta_1.1_spec</artifactId>
-            <version>1.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
-            <version>2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -287,13 +266,27 @@
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.confman</groupId>
             <artifactId>pax-confman-propsloader</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-service</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.xbean</groupId>

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=596581&r1=596580&r2=596581&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
Tue Nov 20 01:37:30 2007
@@ -219,6 +219,7 @@
                 <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>
             </includes>
         </dependencySet>

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=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/bundles/openejb/pom.xml Tue Nov 20 01:37:30 2007
@@ -112,4 +112,32 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>${felix.version}</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <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>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

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=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/itests/tests/pom.xml Tue Nov 20 01:37:30 2007
@@ -125,6 +125,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>org.apache.servicemix.transaction</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.apache.servicemix.examples</groupId>
             <artifactId>org.apache.servicemix.examples.intermediary</artifactId>
             <scope>provided</scope>
@@ -464,28 +469,22 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.configadmin</artifactId>
-            <version>0.9.0-SNAPSHOT</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>0.9.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
-            <version>0.9.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.confman</groupId>
             <artifactId>pax-confman-propsloader</artifactId>
-            <version>0.3.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.web</groupId>
+            <artifactId>pax-web-service</artifactId>
         </dependency>
     </dependencies>
 

Copied: servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java
(from r596355, servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/EjbIntegrationTest.java)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java?p2=servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java&p1=servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/EjbIntegrationTest.java&r1=596355&r2=596581&rev=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/EjbIntegrationTest.java
(original)
+++ servicemix/branches/servicemix-4.0/itests/tests/src/test/java/org/apache/servicemix/openejb/OpenEjbIntegrationTest.java
Tue Nov 20 01:37:30 2007
@@ -14,16 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.servicemix;
+package org.apache.servicemix.openejb;
 
 import java.util.Properties;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.servicemix.AbstractIntegrationTest;
 
-public class EjbIntegrationTest extends AbstractIntegrationTest {
+public class OpenEjbIntegrationTest extends AbstractIntegrationTest {
 
-    private static final Log LOGGER = LogFactory.getLog(EjbIntegrationTest.class);
+    private static final Log LOGGER = LogFactory.getLog(OpenEjbIntegrationTest.class);
 
     private Properties dependencies;
 
@@ -55,6 +56,7 @@
      */
     protected String[] getTestBundlesNames() {
         return new String[] {
+            getBundle("org.springframework", "spring-tx"),
             getBundle("org.apache.xbean", "xbean-finder"),
             getBundle("org.apache.xbean", "xbean-naming"),
             getBundle("org.apache.xbean", "xbean-reflect"),
@@ -85,7 +87,8 @@
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
             getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
-            getBundle("org.apache.servicemix.openejb", "org.apache.servicemix.openejb"),
+            getBundle("org.apache.servicemix", "org.apache.servicemix.transaction"),
+            getBundle("org.ops4j.pax.web", "pax-web-service"),
         };
     }
 
@@ -94,13 +97,25 @@
 	 * 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(1000);
+        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(1000);
+        Thread.sleep(2000);
     }
 
 }

Modified: servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml?rev=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/jbi/itests/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/jbi/itests/pom.xml Tue Nov 20 01:37:30 2007
@@ -105,6 +105,16 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.servicemix.openejb</groupId>
+            <artifactId>org.apache.servicemix.openejb</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>org.apache.servicemix.transaction</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
             <version>${spring.version}</version>
@@ -266,31 +276,11 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>0.9.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-service</artifactId>
-            <version>0.9.7-SNAPSHOT</version>
-        </dependency>
-        <!--
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-eip</artifactId>
-            <classifier>installer</classifier>
-            <type>zip</type>
-            <version>3.2.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix</groupId>
-            <artifactId>servicemix-shared-compat</artifactId>
-            <classifier>installer</classifier>
-            <type>zip</type>
-            <version>3.2.1-SNAPSHOT</version>
-            <scope>provided</scope>
         </dependency>
-        -->
     </dependencies>
 
     <build>

Modified: servicemix/branches/servicemix-4.0/openejb/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/openejb/pom.xml?rev=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/openejb/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/openejb/pom.xml Tue Nov 20 01:37:30 2007
@@ -164,6 +164,8 @@
                             javax.xml.rpc*;resolution:=optional,
                             *
                         </Import-Package>
+                        <!-- Needed for jaxb annotations classes -->
+                        <DynamicImport-Package>javax.xml.bind.annotation.*</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/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/Deployer.java?rev=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/Deployer.java
(original)
+++ servicemix/branches/servicemix-4.0/openejb/src/main/java/org/apache/servicemix/openejb/Deployer.java
Tue Nov 20 01:37:30 2007
@@ -50,12 +50,16 @@
     private static final Log LOGGER = LogFactory.getLog(Deployer.class);
 
     public void deploy(ClassLoader classLoader, String location) throws Exception {
+
+        // TODO: this does not work
         Map<String, URL> descriptors = new ResourceFinder(null, classLoader).getResourcesMap("META-INF/");
 
-        URL ejbJarXmlUrl = descriptors.get("ejb-jar.xml");
+        URL ejbJarXmlUrl = classLoader.getResource("META-INF/ejb-jar.xml");
         if (ejbJarXmlUrl == null) {
+            System.out.println("Descriptor ejb-jar.xml not found");
             return;
         }
+        System.out.println("Descriptor ejb-jar.xml found!");
         EjbJar ejbJar = ReadDescriptors.readEjbJar(ejbJarXmlUrl);
         // create the EJB Module
         EjbModule ejbModule = new EjbModule(classLoader, location, ejbJar, null);
@@ -77,16 +81,7 @@
         Assembler assembler = (Assembler) SystemInstance.get().getComponent(org.apache.openejb.spi.Assembler.class);
         AppInfo appInfo = configurationFactory.configureApplication(appModule);
         assembler.createApplication(appInfo, classLoader);
-    }
-
-    private Map<String, URL> getDescriptors(URL moduleUrl) throws OpenEJBException
{
-        try {
-            ResourceFinder finder = new ResourceFinder(moduleUrl);
-            return finder.getResourcesMap("META-INF/");
-
-        } catch (IOException e) {
-            throw new OpenEJBException("Unable to determine descriptors in jar.", e);
-        }
+        System.out.println("EJB deployed");
     }
 
     private void addWebservices(WsModule wsModule) throws OpenEJBException {

Modified: servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/pom.xml?rev=596581&r1=596580&r2=596581&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/pom.xml Tue Nov 20 01:37:30 2007
@@ -632,6 +632,37 @@
                 <artifactId>xbean-reflect</artifactId>
                 <version>${xbean.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.configadmin</artifactId>
+                <version>0.9.0-SNAPSHOT</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.felix</groupId>
+                        <artifactId>org.osgi.core</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-api</artifactId>
+                <version>0.9.7-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.logging</groupId>
+                <artifactId>pax-logging-service</artifactId>
+                <version>0.9.7-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.confman</groupId>
+                <artifactId>pax-confman-propsloader</artifactId>
+                <version>0.3.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.web</groupId>
+                <artifactId>pax-web-service</artifactId>
+                <version>0.2.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message