Author: rfeng
Date: Fri Sep 12 17:35:47 2008
New Revision: 694857
URL: http://svn.apache.org/viewvc?rev=694857&view=rev
Log:
Add a module to represent 3rd party jars as an OSGi bundle (merged from trunk)
Added:
tuscany/branches/sca-equinox/modules/thirdparty-library/ (props changed)
- copied from r694855, tuscany/java/sca/modules/thirdparty-library/
tuscany/branches/sca-equinox/modules/thirdparty-library/pom.xml
- copied unchanged from r694855,
tuscany/java/sca/modules/thirdparty-library/pom.xml
tuscany/branches/sca-equinox/modules/thirdparty-library/src/
- copied from r694855, tuscany/java/sca/modules/thirdparty-library/src/
tuscany/branches/sca-equinox/modules/thirdparty-library/src/main/
- copied from r694855,
tuscany/java/sca/modules/thirdparty-library/src/main/
tuscany/branches/sca-equinox/modules/thirdparty-library/src/main/resources/
- copied from r694855,
tuscany/java/sca/modules/thirdparty-library/src/main/resources/
Modified:
tuscany/branches/sca-equinox/modules/ (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/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-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-webapp/ (props changed)
tuscany/branches/sca-equinox/modules/tracing-aspectj/ (props changed)
Propchange: tuscany/branches/sca-equinox/modules/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/modules:671193
+/tuscany/java/sca/modules:694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java:694837-694843,694855
Propchange:
tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/binding-gdata-runtime-gsoc/src/test/resources/log4j.properties:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata:694837-694843
+/tuscany/java/sca/modules/binding-gdata-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java:694837-694843
+/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl:694837-694843
+/tuscany/java/sca/modules/binding-gdata/src/main/java/org/apache/tuscany/sca/binding/gdata/impl:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory:694837-694843
+/tuscany/java/sca/modules/binding-gdata/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory:694837-694843,694855
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java:694837-694843,694855
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java:694837-694843,694855
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java:694837-694843,694855
Propchange:
tuscany/branches/sca-equinox/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/extensibility-equinox/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/extensibility-eclipse:671193,680620-680628
-/tuscany/java/sca/modules/extensibility-equinox:694837-694843
+/tuscany/java/sca/modules/extensibility-equinox:694837-694843,694855
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:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:694837-694843
+/tuscany/java/sca/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:694837-694843
+/tuscany/java/sca/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:694837-694843,694855
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:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider:694837-694843,694855
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:35:47 2008
@@ -1,2 +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
+/tuscany/java/sca/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:694837-694843
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:694837-694843
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843
+/tuscany/java/sca/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843,694855
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:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843
+/tuscany/java/sca/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/node-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-api:671193,680620-680628
-/tuscany/java/sca/modules/node-api:694837-694843
+/tuscany/java/sca/modules/node-api:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/node-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-impl:671193,680620-680628
-/tuscany/java/sca/modules/node-impl:694837-694843
+/tuscany/java/sca/modules/node-impl:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/node-launcher/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher:671193,680620-680628
-/tuscany/java/sca/modules/node-launcher:694837-694843
+/tuscany/java/sca/modules/node-launcher:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/node-launcher-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher-osgi:671193,680620-680628
-/tuscany/java/sca/modules/node-launcher-osgi:694837-694843
+/tuscany/java/sca/modules/node-launcher-osgi:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/node-launcher-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher-webapp:671193,680620-680628
-/tuscany/java/sca/modules/node-launcher-webapp:694837-694843
+/tuscany/java/sca/modules/node-launcher-webapp:694837-694843,694855
Propchange: tuscany/branches/sca-equinox/modules/thirdparty-library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Sep 12 17:35:47 2008
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+*.log*
+.project
+.classpath
+junit*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
+META-INF
+lib
Propchange: tuscany/branches/sca-equinox/modules/tracing-aspectj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 12 17:35:47 2008
@@ -1 +1 @@
-/tuscany/java/sca/modules/tracing-aspectj:694837-694843
+/tuscany/java/sca/modules/tracing-aspectj:694837-694843,694855
