From f80619743397f217f6f8527a530994fa45046341 Mon Sep 17 00:00:00 2001 From: rfeng Date: Wed, 25 Mar 2009 23:53:54 +0000 Subject: Upgrade to equinox 3.4.x git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@758468 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/contribution-osgi/pom.xml | 2 +- java/sca/modules/extensibility-equinox/pom.xml | 38 ++-------- .../equinox/EquinoxServiceDiscovererTestCase.java | 36 +++++----- .../modules/implementation-osgi-runtime/pom.xml | 15 ++-- java/sca/modules/implementation-osgi/pom.xml | 2 +- java/sca/modules/node-impl-osgi/pom.xml | 81 ++++++++++------------ java/sca/modules/node-launcher-equinox/pom.xml | 22 +++--- java/sca/pom.xml | 12 ++++ 8 files changed, 90 insertions(+), 118 deletions(-) (limited to 'java/sca') diff --git a/java/sca/modules/contribution-osgi/pom.xml b/java/sca/modules/contribution-osgi/pom.xml index 8ffb0c9664..d7ce9b2631 100644 --- a/java/sca/modules/contribution-osgi/pom.xml +++ b/java/sca/modules/contribution-osgi/pom.xml @@ -50,7 +50,7 @@ org.eclipse osgi - 3.3.0-v20070530 + 3.4.0-v20080605-1900 compile diff --git a/java/sca/modules/extensibility-equinox/pom.xml b/java/sca/modules/extensibility-equinox/pom.xml index 9177fb68c8..f360fe7c12 100644 --- a/java/sca/modules/extensibility-equinox/pom.xml +++ b/java/sca/modules/extensibility-equinox/pom.xml @@ -7,15 +7,15 @@ * 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. + * under the License. --> 4.0.0 @@ -37,39 +37,9 @@ org.eclipse osgi - 3.3.0-v20070530 + 3.4.0-v20080605-1900 compile - - - - org.eclipse.core - runtime - 3.3.100-v20070530 - test - - - org.eclipse.equinox - app - - - - - - - org.eclipse.equinox - app - 1.0.0-v20070606 - test - - diff --git a/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java index deb5b4fb40..642bad0b2b 100644 --- a/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java +++ b/java/sca/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java @@ -6,15 +6,15 @@ * 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. + * under the License. */ package org.apache.tuscany.sca.extensibility.equinox; @@ -41,7 +41,7 @@ import org.osgi.framework.BundleContext; /** * Test the Equinox service discoverer. - * + * * @version $Rev$ $Date$ */ public class EquinoxServiceDiscovererTestCase { @@ -88,20 +88,22 @@ public class EquinoxServiceDiscovererTestCase { discoverer = new EquinoxServiceDiscoverer(context); File dep = new File("target/bundles"); List bundles = new ArrayList(); + if(dep.isDirectory()) { for (File f : dep.listFiles()) { - BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f)); - JarInputStream jis = new JarInputStream(bis); - Manifest manifest = jis.getManifest(); - if (manifest == null || manifest.getMainAttributes().getValue("Bundle-Name") == null) { + BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f)); + JarInputStream jis = new JarInputStream(bis); + Manifest manifest = jis.getManifest(); + if (manifest == null || manifest.getMainAttributes().getValue("Bundle-Name") == null) { + bis.close(); + continue; + } + bis.close(); + bis = new BufferedInputStream(new FileInputStream(f)); + Bundle b = context.installBundle(f.getName(), bis); + System.out.println("Installed " + b.getSymbolicName() + " [" + getState(b) + "]"); + bundles.add(b); bis.close(); - continue; } - bis.close(); - bis = new BufferedInputStream(new FileInputStream(f)); - Bundle b = context.installBundle(f.getName(), bis); - System.out.println("Installed "+b.getSymbolicName() + " [" + getState(b) + "]"); - bundles.add(b); - bis.close(); } for (Bundle b : bundles) { b.start(); @@ -144,7 +146,7 @@ public class EquinoxServiceDiscovererTestCase { Assert.assertNotNull(descriptor); descriptor = discoverer.getFirstServiceDeclaration("notthere"); Assert.assertNull(descriptor); - } - + } + } diff --git a/java/sca/modules/implementation-osgi-runtime/pom.xml b/java/sca/modules/implementation-osgi-runtime/pom.xml index 71f42270e0..215df67fe8 100644 --- a/java/sca/modules/implementation-osgi-runtime/pom.xml +++ b/java/sca/modules/implementation-osgi-runtime/pom.xml @@ -39,35 +39,28 @@ tuscany-implementation-osgi 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-contribution-osgi 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-contribution-java 2.0-SNAPSHOT runtime - + org.eclipse osgi - 3.3.0-v20070530 + 3.4.0-v20080605-1900 compile - - org.eclipse.osgi - services - 3.1.200-v20070605 - test - - org.apache.tuscany.sca tuscany-core diff --git a/java/sca/modules/implementation-osgi/pom.xml b/java/sca/modules/implementation-osgi/pom.xml index 2ffb4f4d59..1887bcba96 100644 --- a/java/sca/modules/implementation-osgi/pom.xml +++ b/java/sca/modules/implementation-osgi/pom.xml @@ -37,7 +37,7 @@ org.eclipse osgi - 3.3.0-v20070530 + 3.4.0-v20080605-1900 compile diff --git a/java/sca/modules/node-impl-osgi/pom.xml b/java/sca/modules/node-impl-osgi/pom.xml index cc42ebbd00..3d7f61f8ea 100644 --- a/java/sca/modules/node-impl-osgi/pom.xml +++ b/java/sca/modules/node-impl-osgi/pom.xml @@ -29,16 +29,15 @@ tuscany-node-impl-osgi Apache Tuscany SCA OSGi Node Implementation - + + tuscany.repo + Tuscany Maven 2.x Repository + http://svn.apache.org/repos/asf/tuscany/maven false - rfeng.repo - A Temporary Maven 2.x Repository for Equinox 3.4.2 - http://people.apache.org/~rfeng/repo/maven2/ - default @@ -47,21 +46,15 @@ org.eclipse osgi 3.4.0-v20080605-1900 - compile org.eclipse.osgi services 3.1.200-v20071203 - test - - + + org.eclipse.equinox @@ -69,91 +62,91 @@ 1.0.0-v20080427-0830 test - + org.eclipse.equinox util 1.0.0-v20080414 test - + org.apache.tuscany.sca tuscany-assembly 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-contribution 2.0-SNAPSHOT - - + + org.apache.tuscany.sca tuscany-contribution-java 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-extensibility-equinox 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-contribution-osgi 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-node-api 2.0-SNAPSHOT - - + + org.apache.tuscany.sca tuscany-implementation-node 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-core 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-contribution 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-assembly-xml 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-workspace 2.0-SNAPSHOT - + org.apache.tuscany.sca tuscany-workspace-impl 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-definitions-xml @@ -195,70 +188,70 @@ 2.0-SNAPSHOT runtime - + org.apache.tuscany.sca tuscany-endpoint 2.0-SNAPSHOT runtime - - + + org.apache.tuscany.sca tuscany-implementation-java-runtime 2.0-SNAPSHOT test - - + + org.apache.tuscany.sca tuscany-node-launcher-equinox 2.0-SNAPSHOT test - - + + org.apache.tuscany.sca tuscany-binding-rmi-runtime 2.0-SNAPSHOT test - + org.apache.tuscany.sca tuscany-binding-rmi 2.0-SNAPSHOT test - + org.apache.tuscany.sca tuscany-host-rmi 2.0-SNAPSHOT test - - + + org.apache.tuscany.sca tuscany-implementation-osgi 2.0-SNAPSHOT test - + org.apache.tuscany.sca tuscany-implementation-osgi-runtime 2.0-SNAPSHOT test - + cglib cglib 2.2 test - - + + diff --git a/java/sca/modules/node-launcher-equinox/pom.xml b/java/sca/modules/node-launcher-equinox/pom.xml index 608ba3ee51..c6de6acdd3 100644 --- a/java/sca/modules/node-launcher-equinox/pom.xml +++ b/java/sca/modules/node-launcher-equinox/pom.xml @@ -30,7 +30,7 @@ tuscany-node-launcher-equinox Apache Tuscany SCA Node Equinox OSGi Launcher - + javax.servlet servlet-api @@ -40,10 +40,11 @@ org.eclipse osgi - 3.3.0-v20070530 + 3.4.0-v20080605-1900 compile + + commons-cli commons-cli - 1.1 - + 1.2 + org.apache.tuscany.sca @@ -83,14 +85,14 @@ 2.0-SNAPSHOT test - + - + + org.apache.tuscany.sca tuscany-implementation-java-runtime diff --git a/java/sca/pom.xml b/java/sca/pom.xml index 32e8c73286..7873830c3e 100644 --- a/java/sca/pom.xml +++ b/java/sca/pom.xml @@ -74,6 +74,18 @@ true + + + tuscany.repo + Tuscany Maven 2.x Repository + http://svn.apache.org/repos/asf/tuscany/maven + + true + + + false + + apache.ws.zone Apache WS Zone Repository -- cgit v1.2.3