From 02337e4a7c49f36b6e0a1c19535f635dec7926b0 Mon Sep 17 00:00:00 2001
From: rfeng <rfeng@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 21 Oct 2008 18:23:23 +0000
Subject: Restrict Export-Package

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@706706 13f79535-47bb-0310-9956-ffa450edef68
---
 branches/sca-equinox/modules/assembly-xml/pom.xml  |   2 +-
 .../modules/binding-ws-axis2-policy/pom.xml        |   5 +-
 .../sca-equinox/modules/binding-ws-axis2/pom.xml   |   2 +-
 .../sca-equinox/modules/binding-ws-wsdlgen/pom.xml |   2 +-
 branches/sca-equinox/modules/binding-ws/pom.xml    |   5 +-
 .../sca-equinox/modules/databinding-jaxb/pom.xml   |   2 +-
 branches/sca-equinox/modules/databinding/pom.xml   |   9 +-
 .../sca-equinox/modules/domain-manager/pom.xml     |   5 +-
 .../modules/extensibility-equinox/pom.xml          |   2 +-
 branches/sca-equinox/modules/host-http/pom.xml     |   2 +-
 .../sca-equinox/modules/host-webapp-junit/pom.xml  |   2 +-
 branches/sca-equinox/modules/host-webapp/pom.xml   |   5 +-
 .../modules/implementation-bpel-ode/pom.xml        | 828 ++++++++++-----------
 .../sca-equinox/modules/implementation-ejb/pom.xml |   2 +-
 .../modules/implementation-java-xml/pom.xml        |   2 +-
 .../modules/implementation-spring/pom.xml          |   2 +-
 .../spring/xml/SpringSCAPropertyElement.java.orig  |  44 --
 .../modules/implementation-widget-runtime/pom.xml  |   2 +-
 .../modules/implementation-widget/pom.xml          |   2 +-
 .../modules/implementation-xquery/pom.xml          |   2 +-
 .../modules/interface-java-jaxws/pom.xml           |   2 +-
 .../sca-equinox/modules/interface-java/pom.xml     |   6 +-
 branches/sca-equinox/modules/interface/pom.xml     |   6 +-
 branches/sca-equinox/modules/node-api/pom.xml      |   2 +-
 branches/sca-equinox/modules/node-impl/pom.xml     |   2 +-
 .../modules/node-launcher-equinox/pom.xml          |   2 +-
 branches/sca-equinox/modules/node-launcher/pom.xml |   2 +-
 branches/sca-equinox/modules/node-manager/pom.xml  |   2 +-
 .../modules/policy-security-jsr250/pom.xml         |   2 +-
 .../sca-equinox/modules/policy-security-ws/pom.xml |   2 +-
 .../sca-equinox/modules/policy-security/pom.xml    |   8 +-
 branches/sca-equinox/modules/policy-xml/pom.xml    |   2 +-
 branches/sca-equinox/modules/policy/pom.xml        |   5 +-
 branches/sca-equinox/modules/sca-api/pom.xml       |   2 +-
 34 files changed, 479 insertions(+), 493 deletions(-)
 delete mode 100644 branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig

diff --git a/branches/sca-equinox/modules/assembly-xml/pom.xml b/branches/sca-equinox/modules/assembly-xml/pom.xml
index 04961fbd62..b45ba6b82c 100644
--- a/branches/sca-equinox/modules/assembly-xml/pom.xml
+++ b/branches/sca-equinox/modules/assembly-xml/pom.xml
@@ -124,7 +124,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.assembly.xml</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.assembly.xml*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.assembly.xml</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
index c771361acb..224a076103 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws-axis2-policy/pom.xml
@@ -132,7 +132,10 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.security.ws</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.security.ws*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.binding.ws.axis2.policy.authentication.basic,
+                            org.apache.tuscany.sca.binding.ws.axis2.policy.configuration
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
index d9253b9cbe..ba8891df48 100644
--- a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
@@ -301,7 +301,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.binding.ws.axis2</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws.axis2*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.binding.ws.axis2</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml b/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
index 012076b3b5..104ac7d07b 100644
--- a/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws-wsdlgen/pom.xml
@@ -103,7 +103,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.binding.ws.wsdlgen</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws.wsdlgen*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.binding.ws.wsdlgen</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/binding-ws/pom.xml b/branches/sca-equinox/modules/binding-ws/pom.xml
index 8a6ade06eb..a6e5e0accc 100644
--- a/branches/sca-equinox/modules/binding-ws/pom.xml
+++ b/branches/sca-equinox/modules/binding-ws/pom.xml
@@ -75,7 +75,10 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.binding.ws</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.binding.ws*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.binding.ws,
+                            org.apache.tuscany.sca.binding.ws.addressing
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/databinding-jaxb/pom.xml b/branches/sca-equinox/modules/databinding-jaxb/pom.xml
index 8b819e06d3..9411572f41 100644
--- a/branches/sca-equinox/modules/databinding-jaxb/pom.xml
+++ b/branches/sca-equinox/modules/databinding-jaxb/pom.xml
@@ -174,7 +174,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.databinding.jaxb</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding.jaxb*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.databinding.jaxb</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/databinding/pom.xml b/branches/sca-equinox/modules/databinding/pom.xml
index 8021c62970..1af4f28647 100644
--- a/branches/sca-equinox/modules/databinding/pom.xml
+++ b/branches/sca-equinox/modules/databinding/pom.xml
@@ -98,7 +98,14 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.databinding</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.databinding*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.databinding,
+                            org.apache.tuscany.sca.databinding.annotation,
+                            org.apache.tuscany.sca.databinding.impl,
+                            org.apache.tuscany.sca.databinding.javabeans,
+                            org.apache.tuscany.sca.databinding.util,
+                            org.apache.tuscany.sca.databinding.xml
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/domain-manager/pom.xml b/branches/sca-equinox/modules/domain-manager/pom.xml
index 85f35f7381..17394a309d 100644
--- a/branches/sca-equinox/modules/domain-manager/pom.xml
+++ b/branches/sca-equinox/modules/domain-manager/pom.xml
@@ -190,7 +190,10 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.domain.manager</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.domain.manager*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.domain.manager.impl,
+                            org.apache.tuscany.sca.domain.manager.launcher
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/extensibility-equinox/pom.xml b/branches/sca-equinox/modules/extensibility-equinox/pom.xml
index 9547e92f34..2ce1fb0a31 100644
--- a/branches/sca-equinox/modules/extensibility-equinox/pom.xml
+++ b/branches/sca-equinox/modules/extensibility-equinox/pom.xml
@@ -100,7 +100,7 @@
                         <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.equinox</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
                         <Bundle-Activator>org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator</Bundle-Activator>
-                        <Export-Package>org.apache.tuscany.sca.extensibility.equinox*</Export-Package>
+                        <Export-Package></Export-Package>
                         <Eclipse-LazyStart>true</Eclipse-LazyStart>
                         <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
                         <DynamicImport-Package>*</DynamicImport-Package> 
diff --git a/branches/sca-equinox/modules/host-http/pom.xml b/branches/sca-equinox/modules/host-http/pom.xml
index 9a6a6d5d3b..fabf47d381 100644
--- a/branches/sca-equinox/modules/host-http/pom.xml
+++ b/branches/sca-equinox/modules/host-http/pom.xml
@@ -54,7 +54,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.host.http</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.http*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.host.http</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/host-webapp-junit/pom.xml b/branches/sca-equinox/modules/host-webapp-junit/pom.xml
index 59bb88aa04..ac947458d7 100644
--- a/branches/sca-equinox/modules/host-webapp-junit/pom.xml
+++ b/branches/sca-equinox/modules/host-webapp-junit/pom.xml
@@ -56,7 +56,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.host.webapp.junit</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.webapp.junit*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.host.webapp.junit</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/host-webapp/pom.xml b/branches/sca-equinox/modules/host-webapp/pom.xml
index 43c9948568..26dda9aaef 100644
--- a/branches/sca-equinox/modules/host-webapp/pom.xml
+++ b/branches/sca-equinox/modules/host-webapp/pom.xml
@@ -75,7 +75,10 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.host.webapp</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.host.webapp*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.host.webapp,
+                            org.apache.tuscany.sca.host.webapp.jsp
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml b/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
index 08f6a15ca1..388c6e6311 100644
--- a/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
+++ b/branches/sca-equinox/modules/implementation-bpel-ode/pom.xml
@@ -1,421 +1,414 @@
 <?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>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-modules</artifactId>
-		<version>1.4-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<artifactId>tuscany-implementation-bpel-ode</artifactId>
-	<name>Apache Tuscany SCA BPEL ODE Implementation Extension</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-assembly</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-bpel</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-core</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-assembly-xml</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-contribution</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-sca-api</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-databinding-sdo</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-implementation-java-runtime</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-                <dependency>
-                    <groupId>org.apache.tuscany.sca</groupId>
-                    <artifactId>tuscany-node-impl</artifactId>
-                    <version>1.4-SNAPSHOT</version>
-                </dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface-wsdl-xml</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sdo</groupId>
-			<artifactId>tuscany-sdo-impl</artifactId>
-			<version>1.1.1</version>
-			<scope>compile</scope>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>stax</groupId>
-                                <artifactId>stax-api</artifactId>
-                            </exclusion>
-                        </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-			<scope>test</scope>
-		</dependency>
-		
-		<!-- ODE Jars -->
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-epr</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-store</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-dao</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-dao</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-dao-jpa</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-			<version>1.1.1</version>
-			<type>zip</type>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-runtime</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-api</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-scheduler-simple</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-utils</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-compiler</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-schemas</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-bpel-obj</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-jacob</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.ode</groupId>
-			<artifactId>ode-jacob-ap</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		
-		<!-- ODE Dependencies -->
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-collections</groupId>
-			<artifactId>commons-collections</artifactId>
-			<version>3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jta_1.0.1B_spec</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-kernel</artifactId>
-			<version>1.2-beta</version>
-			<exclusions>
-				<exclusion>
-					<groupId>mx4j</groupId>
-					<artifactId>mx4j</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xpp3</groupId>
-					<artifactId>xpp3</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>xstream</groupId>
-					<artifactId>xstream</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-transaction</artifactId>
-			<version>1.2-beta</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.geronimo.specs</groupId>
-					<artifactId>geronimo-ejb_2.1_spec</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>ognl</groupId>
-					<artifactId>ognl</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-ejb_3.0_spec</artifactId>
-			<version>1.0</version>
-		</dependency>		
-		<dependency>
-			<groupId>org.apache.geronimo.modules</groupId>
-			<artifactId>geronimo-connector</artifactId>
-			<version>1.2-beta</version>
-			<exclusions>
-				<exclusion>
-					<groupId>xmlbeans</groupId>
-					<artifactId>xbean</artifactId>
-				</exclusion>
-                            <exclusion>
-                                <groupId>stax</groupId>
-                                <artifactId>stax-api</artifactId>
-                            </exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.derby</groupId>
-			<artifactId>derby</artifactId>
-			<version>10.3.1.4</version>
-		</dependency>
-		<dependency>
-			<groupId>tranql</groupId>
-			<artifactId>tranql-connector</artifactId>
-			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.openjpa</groupId>
-			<artifactId>openjpa-all</artifactId>
-			<version>0.9.7-incubating</version>
-			<exclusions>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-lib</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-kernel</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-kernel-5</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-jdbc</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-jdbc-5</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-persistence-jdbc</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.apache.openjpa</groupId>
-					<artifactId>openjpa-xmlstore</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>net.sourceforge.serp</groupId>
-			<artifactId>serp</artifactId>
-			<version>1.12.0</version>
-		</dependency>
-                <dependency>
-                    <groupId>jaxen</groupId>
-                    <artifactId>jaxen</artifactId>
-                    <version>1.1.1</version>
-                    <exclusions>
-				<exclusion>
-					<groupId>xom</groupId>
-					<artifactId>xom</artifactId>
-				</exclusion>
-			  </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>xalan</groupId>
-                    <artifactId>xalan</artifactId>
-                    <version>2.7.0</version>
-                </dependency>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.8.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
-			<artifactId>xmlbeans</artifactId>
-			<version>2.3.0</version>
-                        <exclusions>
-                            <exclusion>
-                                <groupId>stax</groupId>
-                                <artifactId>stax-api</artifactId>
-                            </exclusion>
-                        </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>net.sf.saxon</groupId>
-			<artifactId>saxon</artifactId>
-			<version>8.7</version>
-			<!--version>9.0.0.2</version-->
-		</dependency>
-		<dependency>
-			<groupId>net.sf.saxon</groupId>
-			<artifactId>saxon-dom</artifactId>
-			<version>8.7</version>
-			<!--version>9.0.0.2</version-->
-		</dependency>
-		<dependency>
-			<groupId>net.sf.saxon</groupId>
-			<artifactId>saxon-xpath</artifactId>
-			<version>8.7</version>
-			<!--version>9.0.0.2</version-->
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.3</version>
-			<exclusions>
-			    <exclusion>
-			    <groupId>commons-codec</groupId>
-			    <artifactId>commons-codec</artifactId>
-			    </exclusion>
-			</exclusions>
-		</dependency>		
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.13</version>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>1.4-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-implementation-bpel-ode</artifactId>
+    <name>Apache Tuscany SCA BPEL ODE Implementation Extension</name>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-assembly-xml</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-wsdl-xml</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- ODE Jars -->
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-epr</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-store</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-dao</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-dao</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-dao-jpa</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+            <version>1.1.1</version>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-runtime</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-api</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-scheduler-simple</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-utils</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-compiler</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-schemas</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-bpel-obj</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-jacob</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-jacob-ap</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+
+        <!-- ODE Dependencies -->
+        <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>1.2-beta</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xpp3</groupId>
+                    <artifactId>xpp3</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xstream</groupId>
+                    <artifactId>xstream</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-transaction</artifactId>
+            <version>1.2-beta</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-ejb_2.1_spec</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>ognl</groupId>
+                    <artifactId>ognl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.0_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>1.2-beta</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xmlbeans</groupId>
+                    <artifactId>xbean</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.3.1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql-connector</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-all</artifactId>
+            <version>0.9.7-incubating</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-lib</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-kernel</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-kernel-5</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-jdbc-5</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-persistence-jdbc</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa-xmlstore</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.serp</groupId>
+            <artifactId>serp</artifactId>
+            <version>1.12.0</version>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>xom</groupId>
+                    <artifactId>xom</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>xalan</groupId>
+            <artifactId>xalan</artifactId>
+            <version>2.7.0</version>
+        </dependency>
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.8.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xmlbeans</groupId>
+            <artifactId>xmlbeans</artifactId>
+            <version>2.3.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>saxon</artifactId>
+            <version>8.7</version>
+            <!--version>9.0.0.2</version-->
+        </dependency>
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>saxon-dom</artifactId>
+            <version>8.7</version>
+            <!--version>9.0.0.2</version-->
+        </dependency>
+        <dependency>
+            <groupId>net.sf.saxon</groupId>
+            <artifactId>saxon-xpath</artifactId>
+            <version>8.7</version>
+            <!--version>9.0.0.2</version-->
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-codec</groupId>
+                    <artifactId>commons-codec</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.13</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
                 <!-- http://jira.codehaus.org/browse/SUREFIRE-322 -->
                 <version>2.3.1</version>
-				<configuration>
-					<useFile>false</useFile>
-					<trimStackTrace>false</trimStackTrace>
-					<useSystemClassLoader>true</useSystemClassLoader>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>generate-sources</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+                <configuration>
+                    <useFile>false</useFile>
+                    <trimStackTrace>false</trimStackTrace>
+                    <useSystemClassLoader>true</useSystemClassLoader>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.ode</groupId>
+                                    <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+                                    <version>1.1.1</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>${project.build.directory}/test-classes/
+                                    </outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -424,12 +417,13 @@
                 <configuration>
                     <instructions>
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.bpel.ode</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.bpel.ode
+                        </Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
                         <Export-Package></Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
-		</plugins>
-	</build>
+        </plugins>
+    </build>
 </project>
diff --git a/branches/sca-equinox/modules/implementation-ejb/pom.xml b/branches/sca-equinox/modules/implementation-ejb/pom.xml
index d671743942..710a7b7da5 100644
--- a/branches/sca-equinox/modules/implementation-ejb/pom.xml
+++ b/branches/sca-equinox/modules/implementation-ejb/pom.xml
@@ -71,7 +71,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.ejb</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.ejb*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.implementation.ejb</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/implementation-java-xml/pom.xml b/branches/sca-equinox/modules/implementation-java-xml/pom.xml
index 96b1ae7807..5c79c5e9e0 100644
--- a/branches/sca-equinox/modules/implementation-java-xml/pom.xml
+++ b/branches/sca-equinox/modules/implementation-java-xml/pom.xml
@@ -107,7 +107,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.java.xml</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.java.xml*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.implementation.java.xml</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/implementation-spring/pom.xml b/branches/sca-equinox/modules/implementation-spring/pom.xml
index 0a9f893999..5727fba025 100644
--- a/branches/sca-equinox/modules/implementation-spring/pom.xml
+++ b/branches/sca-equinox/modules/implementation-spring/pom.xml
@@ -115,7 +115,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.spring</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.spring*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.implementation.spring</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig b/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig
deleted file mode 100644
index 19874ad35d..0000000000
--- a/branches/sca-equinox/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringSCAPropertyElement.java.orig
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.tuscany.sca.implementation.spring.xml;
-
-/**
- * Represents an <sca:property> element in a Spring application-context
- * - this has name and type attributes
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
- */
-public class SpringSCAPropertyElement {
-
-    private String name;
-    private String type;
-
-    public SpringSCAPropertyElement(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-} // end class SpringPropertyElement
diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
index 3902dfae58..58d38618dc 100644
--- a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
+++ b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
@@ -111,7 +111,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.widget.runtime</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.widget*</Export-Package>
+                        <Export-Package></Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/implementation-widget/pom.xml b/branches/sca-equinox/modules/implementation-widget/pom.xml
index f9aca74872..2396b9063c 100644
--- a/branches/sca-equinox/modules/implementation-widget/pom.xml
+++ b/branches/sca-equinox/modules/implementation-widget/pom.xml
@@ -69,7 +69,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.widget</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.widget*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.implementation.widget</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/implementation-xquery/pom.xml b/branches/sca-equinox/modules/implementation-xquery/pom.xml
index 0f6a5b66a7..b3feb0c343 100644
--- a/branches/sca-equinox/modules/implementation-xquery/pom.xml
+++ b/branches/sca-equinox/modules/implementation-xquery/pom.xml
@@ -95,7 +95,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.xquery</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.xquery*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.implementation.xquery</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml b/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
index e3a72f6fec..c755307aac 100644
--- a/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
+++ b/branches/sca-equinox/modules/interface-java-jaxws/pom.xml
@@ -243,7 +243,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.interface.java.jaxws</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.java.jaxws*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.interfacedef.java.jaxws</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/interface-java/pom.xml b/branches/sca-equinox/modules/interface-java/pom.xml
index bab2576ea8..377184afe6 100644
--- a/branches/sca-equinox/modules/interface-java/pom.xml
+++ b/branches/sca-equinox/modules/interface-java/pom.xml
@@ -72,7 +72,11 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.interface.java</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef.java*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.interfacedef.java,
+                            org.apache.tuscany.sca.interfacedef.java.impl,
+                            org.apache.tuscany.sca.interfacedef.java.introspect
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/interface/pom.xml b/branches/sca-equinox/modules/interface/pom.xml
index 7c75e66767..a78081c3de 100644
--- a/branches/sca-equinox/modules/interface/pom.xml
+++ b/branches/sca-equinox/modules/interface/pom.xml
@@ -47,7 +47,11 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.interface</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.interfacedef*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.interfacedef,
+                            org.apache.tuscany.sca.interfacedef.impl,
+                            org.apache.tuscany.sca.interfacedef.util
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/node-api/pom.xml b/branches/sca-equinox/modules/node-api/pom.xml
index 02210daa88..122fa8e610 100644
--- a/branches/sca-equinox/modules/node-api/pom.xml
+++ b/branches/sca-equinox/modules/node-api/pom.xml
@@ -50,7 +50,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node.api</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.node*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.node</Export-Package>
                         <DynamicImport-Package>org.apache.tuscany.sca.node.impl,org.apache.tuscany.sca.extensibility</DynamicImport-Package>
                     </instructions>
                 </configuration>
diff --git a/branches/sca-equinox/modules/node-impl/pom.xml b/branches/sca-equinox/modules/node-impl/pom.xml
index 3535df801b..9f242eaad4 100644
--- a/branches/sca-equinox/modules/node-impl/pom.xml
+++ b/branches/sca-equinox/modules/node-impl/pom.xml
@@ -157,7 +157,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node.impl</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.node.impl*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.node.impl</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml b/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
index 365e3830bb..d601a22334 100644
--- a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
+++ b/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
@@ -110,7 +110,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node.launcher.equinox</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.node.equinox.launcher*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.node.equinox.launcher</Export-Package>
                         <Eclipse-AutoStart>true</Eclipse-AutoStart> 
                     </instructions>
                 </configuration>
diff --git a/branches/sca-equinox/modules/node-launcher/pom.xml b/branches/sca-equinox/modules/node-launcher/pom.xml
index ca72f2776b..a84baca586 100644
--- a/branches/sca-equinox/modules/node-launcher/pom.xml
+++ b/branches/sca-equinox/modules/node-launcher/pom.xml
@@ -61,7 +61,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node.launcher</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.node*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.node.launcher</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/node-manager/pom.xml b/branches/sca-equinox/modules/node-manager/pom.xml
index dc84c6fe2e..a4eb651d3e 100644
--- a/branches/sca-equinox/modules/node-manager/pom.xml
+++ b/branches/sca-equinox/modules/node-manager/pom.xml
@@ -121,7 +121,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.node.manager</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.implementation.node.manager*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.implementation.node.manager</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/policy-security-jsr250/pom.xml b/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
index edbb3d1648..65de5936d5 100644
--- a/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
+++ b/branches/sca-equinox/modules/policy-security-jsr250/pom.xml
@@ -73,7 +73,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.security.jsr250</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.jsr250*</Export-Package>
+                        <Export-Package></Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/policy-security-ws/pom.xml b/branches/sca-equinox/modules/policy-security-ws/pom.xml
index 3d9f334651..15c023df2c 100644
--- a/branches/sca-equinox/modules/policy-security-ws/pom.xml
+++ b/branches/sca-equinox/modules/policy-security-ws/pom.xml
@@ -132,7 +132,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.security.ws</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.security.ws*</Export-Package>
+                        <Export-Package>org.apache.tuscany.sca.policy.security.ws</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/policy-security/pom.xml b/branches/sca-equinox/modules/policy-security/pom.xml
index 7ad68c2dc2..c5daabf2ee 100644
--- a/branches/sca-equinox/modules/policy-security/pom.xml
+++ b/branches/sca-equinox/modules/policy-security/pom.xml
@@ -53,7 +53,13 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.security</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.policy.authentication.basic,
+                            org.apache.tuscany.sca.policy.authorization,
+                            org.apache.tuscany.sca.policy.identity,
+                            org.apache.tuscany.sca.policy.security,
+                            org.apache.tuscany.sca.policy.security.jaas
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/policy-xml/pom.xml b/branches/sca-equinox/modules/policy-xml/pom.xml
index 0934c768df..baf006f3cd 100644
--- a/branches/sca-equinox/modules/policy-xml/pom.xml
+++ b/branches/sca-equinox/modules/policy-xml/pom.xml
@@ -66,7 +66,7 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy.xml</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy.xml*</Export-Package>
+                        <Export-Package></Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/policy/pom.xml b/branches/sca-equinox/modules/policy/pom.xml
index 2c76db7f89..740bbefc6e 100644
--- a/branches/sca-equinox/modules/policy/pom.xml
+++ b/branches/sca-equinox/modules/policy/pom.xml
@@ -48,7 +48,10 @@
                         <Bundle-Version>${tuscany.version}</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.policy</Bundle-SymbolicName>
                         <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.policy*</Export-Package>
+                        <Export-Package>
+                            org.apache.tuscany.sca.policy,
+                            org.apache.tuscany.sca.policy.util
+                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/branches/sca-equinox/modules/sca-api/pom.xml b/branches/sca-equinox/modules/sca-api/pom.xml
index 54e43ce91c..f6c2509ffa 100644
--- a/branches/sca-equinox/modules/sca-api/pom.xml
+++ b/branches/sca-equinox/modules/sca-api/pom.xml
@@ -43,7 +43,7 @@
                         <Bundle-Version>1.4</Bundle-Version>
                         <Bundle-SymbolicName>org.apache.tuscany.sca.api</Bundle-SymbolicName>
                         <Bundle-Description>${pom.description}</Bundle-Description>
-                        <Export-Package>org.osoa.sca*</Export-Package>
+                        <Export-Package>org.osoa.sca,org.osoa.sca.annotations</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
-- 
cgit v1.2.3