Author: rfeng
Date: Fri Sep 12 17:21:57 2008
New Revision: 694854
URL: http://svn.apache.org/viewvc?rev=694854&view=rev
Log:
Merge changes from trunk
Added:
tuscany/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
- copied unchanged from r694843,
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleMojo.java
tuscany/branches/sca-equinox/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
- copied unchanged from r694843,
tuscany/java/sca/tools/maven/maven-tuscany-bundle-plugin/src/main/java/org/apache/tuscany/tools/sca/tuscany/bundle/plugin/LibraryBundleUtil.java
Modified:
tuscany/branches/sca-equinox/ (props changed)
tuscany/branches/sca-equinox/modules/assembly-java-dsl/ (props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/resources/log4j.properties
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/
(props changed)
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
(props changed)
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
(props changed)
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
(props changed)
tuscany/branches/sca-equinox/modules/extensibility-equinox/ (props
changed)
tuscany/branches/sca-equinox/modules/extensibility-equinox/pom.xml
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
tuscany/branches/sca-equinox/modules/extensibility/pom.xml
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
(props changed)
tuscany/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
(props changed)
tuscany/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
(props changed)
tuscany/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
(props changed)
tuscany/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
(props changed)
tuscany/branches/sca-equinox/modules/implementation-openjpa/ (props
changed)
tuscany/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
(props changed)
tuscany/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
(props changed)
tuscany/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/
(props changed)
tuscany/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/
(props changed)
tuscany/branches/sca-equinox/modules/node-api/ (props changed)
tuscany/branches/sca-equinox/modules/node-impl/ (props changed)
tuscany/branches/sca-equinox/modules/node-launcher/ (props changed)
tuscany/branches/sca-equinox/modules/node-launcher-osgi/ (props changed)
tuscany/branches/sca-equinox/modules/node-launcher-osgi/pom.xml
tuscany/branches/sca-equinox/modules/node-launcher-webapp/ (props changed)
tuscany/branches/sca-equinox/modules/tracing-aspectj/ (props changed)
tuscany/branches/sca-equinox/modules/tracing-aspectj/launcher.bat (props
changed)
tuscany/branches/sca-equinox/modules/tracing-aspectj/pom.xml
tuscany/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
(props changed)
tuscany/branches/sca-equinox/modules/tracing-aspectj/src/main/resources/META-INF/
(props changed)
tuscany/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
(props changed)
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
(props changed)
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
(props changed)
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
(props changed)
tuscany/branches/sca-equinox/samples/store-distributed/ (props changed)
tuscany/branches/sca-equinox/tutorials/store/ (props changed)
Propchange: tuscany/branches/sca-equinox/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3:671193
+/tuscany/java/sca:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/assembly-java-dsl/
('svn:mergeinfo' removed)
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-gdata-runtime-gsoc/src/log4j.properties:671193
+/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/resources/log4j.properties:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/TestBean.java:671193
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/Echo.java:671193
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/BusinessException.java:671193
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-jsonrpc-runtime/src/test/java/org/apache/tuscany/sca/binding/jsonrpc/EchoComponentImpl.java:671193
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/extensibility-equinox/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Sep 12 17:21:57 2008
@@ -1,17 +1,14 @@
target
-work
-dojo
*.iws
*.ipr
*.iml
+*.log*
.project
.classpath
-maven.log
-velocity.log*
junit*.properties
-surefire*.properties
.settings
.deployables
.wtpmodules
.externalToolBuilders
maven-eclipse.xml
+META-INF
Propchange: tuscany/branches/sca-equinox/modules/extensibility-equinox/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/extensibility-eclipse:671193,680620-680628
+/tuscany/java/sca/modules/extensibility-equinox:694837-694843
Modified: tuscany/branches/sca-equinox/modules/extensibility-equinox/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility-equinox/pom.xml?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/extensibility-equinox/pom.xml
(original)
+++ tuscany/branches/sca-equinox/modules/extensibility-equinox/pom.xml Fri Sep
12 17:21:57 2008
@@ -101,7 +101,8 @@
<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>
- <Eclipse-AutoStart>true</Eclipse-AutoStart>
+ <Eclipse-LazyStart>true</Eclipse-LazyStart>
+ <Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
Modified:
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
(original)
+++
tuscany/branches/sca-equinox/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
Fri Sep 12 17:21:57 2008
@@ -116,6 +116,10 @@
}
}
+
+ public static void init() {
+ // Empty static method to trigger the activation of this bundle
+ }
private static String toString(Bundle b) {
StringBuffer sb = new StringBuffer();
Modified: tuscany/branches/sca-equinox/modules/extensibility/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/extensibility/pom.xml?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/extensibility/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/extensibility/pom.xml Fri Sep 12
17:21:57 2008
@@ -41,7 +41,6 @@
<Bundle-SymbolicName>org.apache.tuscany.sca.extensibility</Bundle-SymbolicName>
<Bundle-Description>${pom.name}</Bundle-Description>
<Export-Package>org.apache.tuscany.sca.*</Export-Package>
- <DynamicImport-Package>*</DynamicImport-Package>
</instructions>
</configuration>
</plugin>
Propchange:
tuscany/branches/sca-equinox/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ClasspathServiceDiscover.java:671193,680620-680628
+/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/provider:671193
+/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/EmbeddedODEServerTestCase.java:671193
+/tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/implementation-openjpa/
('svn:mergeinfo' removed)
Propchange:
tuscany/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843
Propchange:
tuscany/branches/sca-equinox/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/node-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-api:671193,680620-680628
+/tuscany/java/sca/modules/node-api:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/node-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-impl:671193,680620-680628
+/tuscany/java/sca/modules/node-impl:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/node-launcher/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher:671193,680620-680628
+/tuscany/java/sca/modules/node-launcher:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/node-launcher-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher-osgi:671193,680620-680628
+/tuscany/java/sca/modules/node-launcher-osgi:694837-694843
Modified: tuscany/branches/sca-equinox/modules/node-launcher-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher-osgi/pom.xml?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher-osgi/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-launcher-osgi/pom.xml Fri Sep 12
17:21:57 2008
@@ -132,7 +132,6 @@
</configuration>
</plugin>
-<!--
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
@@ -146,7 +145,6 @@
</instructions>
</configuration>
</plugin>
- -->
</plugins>
</build>
Propchange: tuscany/branches/sca-equinox/modules/node-launcher-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher-webapp:671193,680620-680628
+/tuscany/java/sca/modules/node-launcher-webapp:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/tracing-aspectj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/modules/tracing-aspectj:694837-694843
Propchange: tuscany/branches/sca-equinox/modules/tracing-aspectj/launcher.bat
('svn:mergeinfo' removed)
Modified: tuscany/branches/sca-equinox/modules/tracing-aspectj/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/tracing-aspectj/pom.xml?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/tracing-aspectj/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/tracing-aspectj/pom.xml Fri Sep 12
17:21:57 2008
@@ -93,6 +93,18 @@
<argLine>-ea -Xmx128m
-javaagent:target/dependency/aspectjweaver-1.6.1.jar</argLine>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Version>1.4</Bundle-Version>
+
<Bundle-SymbolicName>org.apache.tuscany.sca.tracing.aspect</Bundle-SymbolicName>
+
<Bundle-Description>${pom.description}</Bundle-Description>
+ <Export-Package></Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
Propchange:
tuscany/branches/sca-equinox/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
('svn:mergeinfo' removed)
Propchange:
tuscany/branches/sca-equinox/modules/tracing-aspectj/src/main/resources/META-INF/
('svn:mergeinfo' removed)
Modified:
tuscany/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
(original)
+++ tuscany/branches/sca-equinox/samples/calculator-rcp/META-INF/MANIFEST.MF
Fri Sep 12 17:21:57 2008
@@ -9,7 +9,9 @@
org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
-Import-Package: org.osoa.sca;version="1.4.0",
+Import-Package: org.apache.tuscany.sca.extensibility.equinox;version="1.4.0",
+ org.apache.tuscany.sca.node;version="1.4.0",
+ org.osoa.sca;version="1.4.0",
org.osoa.sca.annotations;version="1.4.0"
Bundle-ClassPath: .,
cglib-nodep-2.1_3.jar,
Modified:
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java?rev=694854&r1=694853&r2=694854&view=diff
==============================================================================
---
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
(original)
+++
tuscany/branches/sca-equinox/samples/calculator-rcp/src/main/java/calculator/rcp/Activator.java
Fri Sep 12 17:21:57 2008
@@ -18,6 +18,12 @@
*/
package calculator.rcp;
+import java.io.File;
+
+import org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoverer;
+import org.apache.tuscany.sca.node.SCAContribution;
+import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.SCANodeFactory;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
@@ -33,6 +39,8 @@
// The shared instance
private static Activator plugin;
+ private SCANode node;
+
/**
* The constructor
*/
@@ -46,6 +54,10 @@
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
+ Class<?> cls = EquinoxServiceDiscoverer.class;
+ SCANodeFactory factory = SCANodeFactory.newInstance();
+ node = factory.createSCANode("Calculator.composite", new
SCAContribution("c1", new File("target/classes").toURI().toString()));
+ node.start();
}
/*
@@ -55,6 +67,9 @@
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
+ if (node != null) {
+ node.stop();
+ }
}
/**
Propchange:
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGallery.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -0,0 +1 @@
+/tuscany/java/sca/samples/photo-gallery/src/main/java/launch/LaunchGalleryJCR.java:694837-694843
Propchange:
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/resources/gallery.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/photo-gallery/src/main/resources/uiservices/gallery.html:671193
+/tuscany/java/sca/samples/photo-gallery/src/main/resources/gallery.html:694837-694843
Propchange:
tuscany/branches/sca-equinox/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/photo-gallery/src/main/resources/photo-gallery.composite:671193
+/tuscany/java/sca/samples/photo-gallery/src/main/resources/photo-gallery-jcr.composite:694837-694843
Propchange: tuscany/branches/sca-equinox/samples/store-distributed/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/store:671193
+/tuscany/java/sca/samples/store-distributed:694837-694843
Propchange: tuscany/branches/sca-equinox/tutorials/store/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:21:57 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/tutorial:671193
+/tuscany/java/sca/tutorials/store:694837-694843
