diff options
author | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-25 23:53:54 +0000 |
---|---|---|
committer | rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68> | 2009-03-25 23:53:54 +0000 |
commit | f80619743397f217f6f8527a530994fa45046341 (patch) | |
tree | 0bde12c84063d86135ff53a1608a8320362c6edf /java/sca | |
parent | 1eafab3193550a62edf9a9c7c60c119796a9e7e8 (diff) |
Upgrade to equinox 3.4.x
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@758468 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/sca')
8 files changed, 90 insertions, 118 deletions
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 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> + <version>3.4.0-v20080605-1900</version> <scope>compile</scope> </dependency> 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. --> <project> <modelVersion>4.0.0</modelVersion> @@ -37,39 +37,9 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> + <version>3.4.0-v20080605-1900</version> <scope>compile</scope> </dependency> - - <!-- - Exclude org.eclipse.equinox:app to avoid maven bug/bad equinox version scheme. i.e.: - - Couldn't find a version in [1.0.0-v20070606] to match range [1.0.0,2.0.0) - org.eclipse.equinox:app:jar:null - --> - <dependency> - <groupId>org.eclipse.core</groupId> - <artifactId>runtime</artifactId> - <version>3.3.100-v20070530</version> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>org.eclipse.equinox</groupId> - <artifactId>app</artifactId> - </exclusion> - </exclusions> - </dependency> - - <!-- - Now include org.eclipse.equinox:app explicitly - --> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>app</artifactId> - <version>1.0.0-v20070606</version> - <scope>test</scope> - </dependency> - </dependencies> <build> <plugins> 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<Bundle> bundles = new ArrayList<Bundle>(); + 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,36 +39,29 @@ <artifactId>tuscany-implementation-osgi</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-osgi</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-java</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> + <version>3.4.0-v20080605-1900</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.1.200-v20070605</version> - <scope>test</scope> - </dependency> - - <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-core</artifactId> <version>2.0-SNAPSHOT</version> 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 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> + <version>3.4.0-v20080605-1900</version> <scope>compile</scope> </dependency> 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 @@ <artifactId>tuscany-node-impl-osgi</artifactId> <name>Apache Tuscany SCA OSGi Node Implementation</name> - + <repositories> <repository> + <id>tuscany.repo</id> + <name>Tuscany Maven 2.x Repository</name> + <url>http://svn.apache.org/repos/asf/tuscany/maven</url> <snapshots> <enabled>false</enabled> </snapshots> - <id>rfeng.repo</id> - <name>A Temporary Maven 2.x Repository for Equinox 3.4.2</name> - <url>http://people.apache.org/~rfeng/repo/maven2/</url> - <layout>default</layout> </repository> </repositories> @@ -47,21 +46,15 @@ <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> <version>3.4.0-v20080605-1900</version> - <!-- - <version>3.3.0-v20070530</version> - --> <scope>compile</scope> </dependency> <dependency> <groupId>org.eclipse.osgi</groupId> <artifactId>services</artifactId> <version>3.1.200-v20071203</version> - <!-- - <version>3.1.200-v20070605</version> - --> <scope>test</scope> - </dependency> - + </dependency> + <!-- Equinox Declarative Services --> <dependency> <groupId>org.eclipse.equinox</groupId> @@ -69,91 +62,91 @@ <version>1.0.0-v20080427-0830</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>util</artifactId> <version>1.0.0-v20080414</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-assembly</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-java</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-extensibility-equinox</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-osgi</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-api</artifactId> <version>2.0-SNAPSHOT</version> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-node</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-core</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-assembly-xml</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-workspace</artifactId> <version>2.0-SNAPSHOT</version> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-workspace-impl</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-definitions-xml</artifactId> @@ -195,70 +188,70 @@ <version>2.0-SNAPSHOT</version> <scope>runtime</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-endpoint</artifactId> <version>2.0-SNAPSHOT</version> <scope>runtime</scope> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-launcher-equinox</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-rmi-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-rmi</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-host-rmi</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> - </dependency> - + </dependency> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-osgi</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-osgi-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> - + <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> <version>2.2</version> <scope>test</scope> - </dependency> - + </dependency> + </dependencies> </project> 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 @@ <artifactId>tuscany-node-launcher-equinox</artifactId> <name>Apache Tuscany SCA Node Equinox OSGi Launcher</name> - <dependencies> + <dependencies> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> @@ -40,10 +40,11 @@ <dependency> <groupId>org.eclipse</groupId> <artifactId>osgi</artifactId> - <version>3.3.0-v20070530</version> + <version>3.4.0-v20080605-1900</version> <scope>compile</scope> </dependency> +<!-- <dependency> <groupId>org.eclipse.core</groupId> <artifactId>runtime</artifactId> @@ -55,20 +56,21 @@ <artifactId>app</artifactId> </exclusion> </exclusions> - </dependency> + </dependency> <dependency> <groupId>org.eclipse.equinox</groupId> <artifactId>app</artifactId> <version>1.0.0-v20070606</version> <scope>runtime</scope> - </dependency> - + </dependency> +--> + <dependency> <groupId>commons-cli</groupId> <artifactId>commons-cli</artifactId> - <version>1.1</version> - </dependency> + <version>1.2</version> + </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> @@ -83,14 +85,14 @@ <version>2.0-SNAPSHOT</version> <scope>test</scope> </dependency> - + <!-- dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-http-runtime</artifactId> <version>2.0-SNAPSHOT</version> <scope>test</scope> - </dependency--> - + </dependency--> + <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-runtime</artifactId> 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 @@ <enabled>true</enabled> </snapshots> </repository> + <!-- Tuscany repository to hold artifacts that are not published in the public maven repos --> + <repository> + <id>tuscany.repo</id> + <name>Tuscany Maven 2.x Repository</name> + <url>http://svn.apache.org/repos/asf/tuscany/maven</url> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>false</enabled> + </snapshots> + </repository> <repository> <id>apache.ws.zone</id> <name>Apache WS Zone Repository</name> |