You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/08/15 00:00:35 UTC
svn commit: r565941 - in /incubator/tuscany/java/sca:
itest/osgi-implementation/pom.xml modules/implementation-osgi/pom.xml
samples/osgi-supplychain/pom.xml
Author: rfeng
Date: Tue Aug 14 15:00:35 2007
New Revision: 565941
URL: http://svn.apache.org/viewvc?view=rev&rev=565941
Log:
Move to felix 1.0.0 level
Modified:
incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml
incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml
incubator/tuscany/java/sca/samples/osgi-supplychain/pom.xml
Modified: incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml?view=diff&rev=565941&r1=565940&r2=565941
==============================================================================
--- incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/osgi-implementation/pom.xml Tue Aug 14 15:00:35 2007
@@ -28,41 +28,24 @@
<artifactId>itest-osgi-implementation</artifactId>
<name>Apache Tuscany OSGi-SCA Integration tests</name>
- <repositories>
- <!-- for felix snapshots -->
- <repository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.0.0</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml?view=diff&rev=565941&r1=565940&r2=565941
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-osgi/pom.xml Tue Aug 14 15:00:35 2007
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ * 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.
-->
<project>
@@ -30,23 +30,12 @@
<artifactId>tuscany-implementation-osgi</artifactId>
<name>Apache Tuscany Implementation OSGi</name>
- <repositories>
- <!-- for felix snapshots -->
- <repository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
@@ -60,46 +49,46 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>sca-api</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-core</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
-
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-java</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-interface-java-xml</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-assembly-xml</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
-
- <dependency>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-databinding</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
+ <groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
@@ -111,13 +100,13 @@
<version>2.2</version>
<scope>test</scope>
</dependency>
-
- <dependency>
+
+ <dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-sca</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>test</scope>
- </dependency>
+ </dependency>
</dependencies>
Modified: incubator/tuscany/java/sca/samples/osgi-supplychain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/osgi-supplychain/pom.xml?view=diff&rev=565941&r1=565940&r2=565941
==============================================================================
--- incubator/tuscany/java/sca/samples/osgi-supplychain/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/osgi-supplychain/pom.xml Tue Aug 14 15:00:35 2007
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ * 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.
-->
<project>
<modelVersion>4.0.0</modelVersion>
@@ -28,29 +28,12 @@
<artifactId>sample-osgi-supplychain</artifactId>
<name>Apache Tuscany OSGi Supply Chain Sample</name>
- <repositories>
- <!-- for felix snapshots -->
- <repository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>0.9.0-incubator-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
@@ -82,123 +65,123 @@
</dependencies>
<build>
- <finalName>sample-osgi-supplychain</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.1</version>
-
- <dependencies>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-trax</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
-
- <executions>
- <execution>
- <id>create-bundles</id>
- <phase>generate-test-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="Customer.jar"/>
- <property name="manifest.file.name" value="osgi/Customer.mf"/>
- <property name="files.list"
- value="supplychain/customer/Customer.class \
+ <finalName>sample-osgi-supplychain</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant-trax</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+
+ <executions>
+ <execution>
+ <id>create-bundles</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="Customer.jar" />
+ <property name="manifest.file.name" value="osgi/Customer.mf" />
+ <property name="files.list"
+ value="supplychain/customer/Customer.class \
supplychain/OSGiBundleImpl.class \
- supplychain/customer/OSGiCustomerImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="Retailer.jar"/>
- <property name="manifest.file.name" value="osgi/Retailer.mf"/>
- <property name="files.list"
- value="supplychain/retailer/Retailer.class \
+ supplychain/customer/OSGiCustomerImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="Retailer.jar" />
+ <property name="manifest.file.name" value="osgi/Retailer.mf" />
+ <property name="files.list"
+ value="supplychain/retailer/Retailer.class \
supplychain/OSGiBundleImpl.class \
- supplychain/retailer/OSGiRetailerImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="Shipper.jar"/>
- <property name="manifest.file.name" value="osgi/Shipper.mf"/>
- <property name="files.list"
- value="supplychain/shipper/Shipper.class \
+ supplychain/retailer/OSGiRetailerImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="Shipper.jar" />
+ <property name="manifest.file.name" value="osgi/Shipper.mf" />
+ <property name="files.list"
+ value="supplychain/shipper/Shipper.class \
supplychain/OSGiBundleImpl.class \
- supplychain/shipper/OSGiShipperImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="Warehouse.jar"/>
- <property name="manifest.file.name" value="osgi/Warehouse.mf"/>
- <property name="files.list"
- value="supplychain/warehouse/Warehouse.class \
+ supplychain/shipper/OSGiShipperImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="Warehouse.jar" />
+ <property name="manifest.file.name" value="osgi/Warehouse.mf" />
+ <property name="files.list"
+ value="supplychain/warehouse/Warehouse.class \
supplychain/OSGiBundleImpl.class \
- supplychain/warehouse/OSGiWarehouseImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="DSCustomer.jar"/>
- <property name="manifest.file.name" value="osgi/ds/Customer.mf"/>
- <property name="files.list"
- value="supplychain/customer/Customer.class \
+ supplychain/warehouse/OSGiWarehouseImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="DSCustomer.jar" />
+ <property name="manifest.file.name" value="osgi/ds/Customer.mf" />
+ <property name="files.list"
+ value="supplychain/customer/Customer.class \
osgi/ds/Customer.xml \
- supplychain/customer/OSGiCustomerComponentImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="DSRetailer.jar"/>
- <property name="manifest.file.name" value="osgi/ds/Retailer.mf"/>
- <property name="files.list"
- value="supplychain/retailer/Retailer.class \
+ supplychain/customer/OSGiCustomerComponentImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="DSRetailer.jar" />
+ <property name="manifest.file.name" value="osgi/ds/Retailer.mf" />
+ <property name="files.list"
+ value="supplychain/retailer/Retailer.class \
osgi/ds/Retailer.xml \
- supplychain/retailer/OSGiRetailerComponentImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="DSShipper.jar"/>
- <property name="manifest.file.name" value="osgi/ds/Shipper.mf"/>
- <property name="files.list"
- value="supplychain/shipper/Shipper.class \
+ supplychain/retailer/OSGiRetailerComponentImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="DSShipper.jar" />
+ <property name="manifest.file.name" value="osgi/ds/Shipper.mf" />
+ <property name="files.list"
+ value="supplychain/shipper/Shipper.class \
osgi/ds/Shipper.xml \
- supplychain/shipper/OSGiShipperComponentImpl.class"/>
-
- </ant>
- <ant antfile="./build-bundles.xml" target="create-bundles">
- <property name="jar.dir" value="target"/>
- <property name="files.dir" value="target/classes"/>
- <property name="jar.file.name" value="DSWarehouse.jar"/>
- <property name="manifest.file.name" value="osgi/ds/Warehouse.mf"/>
- <property name="files.list"
- value="supplychain/warehouse/Warehouse.class \
+ supplychain/shipper/OSGiShipperComponentImpl.class" />
+
+ </ant>
+ <ant antfile="./build-bundles.xml" target="create-bundles">
+ <property name="jar.dir" value="target" />
+ <property name="files.dir" value="target/classes" />
+ <property name="jar.file.name" value="DSWarehouse.jar" />
+ <property name="manifest.file.name" value="osgi/ds/Warehouse.mf" />
+ <property name="files.list"
+ value="supplychain/warehouse/Warehouse.class \
osgi/ds/Warehouse.xml \
- supplychain/warehouse/OSGiWarehouseComponentImpl.class"/>
-
- </ant>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
+ supplychain/warehouse/OSGiWarehouseComponentImpl.class" />
+
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org