You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/24 01:44:47 UTC
svn commit: r698404 - in /tuscany/branches/sca-equinox:
distribution/features/all/ distribution/features/ejava/ modules/
modules/binding-atom-abdera/ modules/binding-atom/ modules/host-jetty/
modules/host-jetty/src/main/java/org/apache/tuscany/sca/http...
Author: jsdelfino
Date: Tue Sep 23 16:44:47 2008
New Revision: 698404
URL: http://svn.apache.org/viewvc?rev=698404&view=rev
Log:
Starting to fix jetty OSGi import/exports.
Added:
tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java
- copied, changed from r697664, tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
Removed:
tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java
Modified:
tuscany/branches/sca-equinox/distribution/features/all/pom.xml
tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml
tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
tuscany/branches/sca-equinox/modules/binding-atom/pom.xml
tuscany/branches/sca-equinox/modules/host-jetty/pom.xml
tuscany/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml
tuscany/branches/sca-equinox/modules/pom.xml
Modified: tuscany/branches/sca-equinox/distribution/features/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/all/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/all/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/all/pom.xml Tue Sep 23 16:44:47 2008
@@ -100,12 +100,6 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-das</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-tracing-aspectj</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/features/ejava/pom.xml Tue Sep 23 16:44:47 2008
@@ -68,6 +68,7 @@
<artifactId>tuscany-host-corba-jee</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-ejb</artifactId>
@@ -78,6 +79,7 @@
<artifactId>tuscany-host-openejb</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
+ -->
<!-- Implementations -->
<dependency>
Modified: tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml Tue Sep 23 16:44:47 2008
@@ -206,7 +206,10 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom.abdera</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package>
+ <Export-Package>
+ org.apache.tuscany.sca.binding.atom.collection,
+ org.apache.tuscany.sca.binding.atom.provider
+ </Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/binding-atom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-atom/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-atom/pom.xml Tue Sep 23 16:44:47 2008
@@ -71,8 +71,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.binding.atom</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.binding.atom*</Export-Package>
- <Import-Package>org.apache.tuscany.sca.assembly.xml;version="1.4", *</Import-Package>
+ <Export-Package>org.apache.tuscany.sca.binding.atom</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: tuscany/branches/sca-equinox/modules/host-jetty/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-jetty/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-jetty/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-jetty/pom.xml Tue Sep 23 16:44:47 2008
@@ -66,7 +66,9 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.host.jetty</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.http.jetty*</Export-Package>
+ <Export-Package>
+ org.apache.tuscany.sca.http.jetty,
+ </Export-Package>
<Import-Package>
org.mortbay.jetty;version="6.1.7",
org.mortbay.jetty.handler;version="6.1.7",
Copied: tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java (from r697664, tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java)
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java?p2=tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java&p1=tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java&r1=697664&r2=698404&rev=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/module/JettyRuntimeModuleActivator.java (original)
+++ tuscany/branches/sca-equinox/modules/host-jetty/src/main/java/org/apache/tuscany/sca/http/jetty/JettyRuntimeModuleActivator.java Tue Sep 23 16:44:47 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.http.jetty.module;
+package org.apache.tuscany.sca.http.jetty;
import java.security.AccessController;
import java.security.PrivilegedAction;
@@ -28,7 +28,6 @@
import org.apache.tuscany.sca.core.ModuleActivator;
import org.apache.tuscany.sca.core.UtilityExtensionPoint;
import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint;
-import org.apache.tuscany.sca.http.jetty.JettyServer;
import org.apache.tuscany.sca.work.WorkScheduler;
/**
Modified: tuscany/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator (original)
+++ tuscany/branches/sca-equinox/modules/host-jetty/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator Tue Sep 23 16:44:47 2008
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
# Implementation class for the ModuleActivator
-org.apache.tuscany.sca.http.jetty.module.JettyRuntimeModuleActivator
+org.apache.tuscany.sca.http.jetty.JettyRuntimeModuleActivator
Modified: tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java (original)
+++ tuscany/branches/sca-equinox/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java Tue Sep 23 16:44:47 2008
@@ -272,7 +272,7 @@
if ((bundle.getState() & Bundle.ACTIVE) == 0) {
logger.info("Starting bundle: " + string(bundle, false));
try {
- bundle.start();
+ //bundle.start();
} catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e);
throw e;
Modified: tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/policy-transaction/pom.xml Tue Sep 23 16:44:47 2008
@@ -73,7 +73,7 @@
<Bundle-Version>${tuscany.version}</Bundle-Version>
<Bundle-SymbolicName>org.apache.tuscany.sca.policy.transaction</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.policy.transaction*</Export-Package>
+ <Export-Package>org.apache.tuscany.sca.policy.transaction</Export-Package>
<Import-Package>javax.transaction;version="1.0.1",*</Import-Package>
</instructions>
</configuration>
Modified: tuscany/branches/sca-equinox/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/pom.xml?rev=698404&r1=698403&r2=698404&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/pom.xml Tue Sep 23 16:44:47 2008
@@ -102,11 +102,15 @@
<module>host-corba-jee</module>
<module>host-corba-jse</module>
<module>host-corba-jse-tns</module>
+ <!--
<module>host-ejb</module>
+ -->
<module>host-embedded</module>
<module>host-http</module>
<module>host-jetty</module>
+ <!--
<module>host-openejb</module>
+ -->
<module>host-rmi</module>
<!--
<module>host-tomcat</module>