You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/12/08 15:06:59 UTC
svn commit: r724350 [3/3] - in /tuscany/branches/sca-java-1.4: ./
distribution/src/main/assembly/
itest/binding-sca-jms/client/src/test/java/itest/
itest/binding-sca-jms/service/src/test/java/itest/
itest/corba/src/test/java/org/apache/tuscany/sca/test...
Modified: tuscany/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java (original)
+++ tuscany/branches/sca-java-1.4/modules/binding-corba-runtime/src/test/java/org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java Mon Dec 8 06:06:56 2008
@@ -1,100 +1,118 @@
-package org.apache.tuscany.sca.binding.corba.testing.arrays_unions;
-
-
-/**
-* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java .
-* Generated by the IDL-to-Java compiler (portable), version "3.2"
-* from arrays_unions.idl
-* niedziela, 17 sierpieñ 2008 15:45:39 CEST
-*/
-
-public class _ArraysUnionsTestsStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests
-{
-
- public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct passTestStruct (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg)
- {
- org.omg.CORBA.portable.InputStream $in = null;
- try {
- org.omg.CORBA.portable.OutputStream $out = _request ("passTestStruct", true);
- org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write ($out, arg);
- $in = _invoke ($out);
- org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read ($in);
- return $result;
- } catch (org.omg.CORBA.portable.ApplicationException $ex) {
- $in = $ex.getInputStream ();
- String _id = $ex.getId ();
- throw new org.omg.CORBA.MARSHAL (_id);
- } catch (org.omg.CORBA.portable.RemarshalException $rm) {
- return passTestStruct (arg );
- } finally {
- _releaseReply ($in);
- }
- } // passTestStruct
-
- public String[][] passStringArray (String[][] arg)
- {
- org.omg.CORBA.portable.InputStream $in = null;
- try {
- org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
- org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write ($out, arg);
- $in = _invoke ($out);
- String $result[][] = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read ($in);
- return $result;
- } catch (org.omg.CORBA.portable.ApplicationException $ex) {
- $in = $ex.getInputStream ();
- String _id = $ex.getId ();
- throw new org.omg.CORBA.MARSHAL (_id);
- } catch (org.omg.CORBA.portable.RemarshalException $rm) {
- return passStringArray (arg );
- } finally {
- _releaseReply ($in);
- }
- } // passStringArray
-
- public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion passRichUnion (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg)
- {
- org.omg.CORBA.portable.InputStream $in = null;
- try {
- org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
- org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write ($out, arg);
- $in = _invoke ($out);
- org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read ($in);
- return $result;
- } catch (org.omg.CORBA.portable.ApplicationException $ex) {
- $in = $ex.getInputStream ();
- String _id = $ex.getId ();
- throw new org.omg.CORBA.MARSHAL (_id);
- } catch (org.omg.CORBA.portable.RemarshalException $rm) {
- return passRichUnion (arg );
- } finally {
- _releaseReply ($in);
- }
- } // passRichUnion
-
- // Type-specific CORBA::Object operations
- private static String[] __ids = {
- "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
-
- public String[] _ids ()
- {
- return (String[])__ids.clone ();
- }
-
- private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
- {
- String str = s.readUTF ();
- String[] args = null;
- java.util.Properties props = null;
- org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
- org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
- _set_delegate (delegate);
- }
-
- private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
- {
- String[] args = null;
- java.util.Properties props = null;
- String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
- s.writeUTF (str);
- }
-} // class _ArraysUnionsTestsStub
+/*
+ * 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.binding.corba.testing.arrays_unions;
+
+
+/**
+* org/apache/tuscany/sca/binding/corba/testing/arrays_unions/_ArraysUnionsTestsStub.java .
+* Generated by the IDL-to-Java compiler (portable), version "3.2"
+* from arrays_unions.idl
+* niedziela, 17 sierpieñ 2008 15:45:39 CEST
+*/
+
+public class _ArraysUnionsTestsStub extends org.omg.CORBA.portable.ObjectImpl implements org.apache.tuscany.sca.binding.corba.testing.arrays_unions.ArraysUnionsTests
+{
+
+ public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct passTestStruct (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct arg)
+ {
+ org.omg.CORBA.portable.InputStream $in = null;
+ try {
+ org.omg.CORBA.portable.OutputStream $out = _request ("passTestStruct", true);
+ org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.write ($out, arg);
+ $in = _invoke ($out);
+ org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStruct $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.TestStructHelper.read ($in);
+ return $result;
+ } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+ $in = $ex.getInputStream ();
+ String _id = $ex.getId ();
+ throw new org.omg.CORBA.MARSHAL (_id);
+ } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+ return passTestStruct (arg );
+ } finally {
+ _releaseReply ($in);
+ }
+ } // passTestStruct
+
+ public String[][] passStringArray (String[][] arg)
+ {
+ org.omg.CORBA.portable.InputStream $in = null;
+ try {
+ org.omg.CORBA.portable.OutputStream $out = _request ("passStringArray", true);
+ org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.write ($out, arg);
+ $in = _invoke ($out);
+ String $result[][] = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.StringArrayHelper.read ($in);
+ return $result;
+ } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+ $in = $ex.getInputStream ();
+ String _id = $ex.getId ();
+ throw new org.omg.CORBA.MARSHAL (_id);
+ } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+ return passStringArray (arg );
+ } finally {
+ _releaseReply ($in);
+ }
+ } // passStringArray
+
+ public org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion passRichUnion (org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion arg)
+ {
+ org.omg.CORBA.portable.InputStream $in = null;
+ try {
+ org.omg.CORBA.portable.OutputStream $out = _request ("passRichUnion", true);
+ org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.write ($out, arg);
+ $in = _invoke ($out);
+ org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnion $result = org.apache.tuscany.sca.binding.corba.testing.arrays_unions.RichUnionHelper.read ($in);
+ return $result;
+ } catch (org.omg.CORBA.portable.ApplicationException $ex) {
+ $in = $ex.getInputStream ();
+ String _id = $ex.getId ();
+ throw new org.omg.CORBA.MARSHAL (_id);
+ } catch (org.omg.CORBA.portable.RemarshalException $rm) {
+ return passRichUnion (arg );
+ } finally {
+ _releaseReply ($in);
+ }
+ } // passRichUnion
+
+ // Type-specific CORBA::Object operations
+ private static String[] __ids = {
+ "IDL:org/apache/tuscany/sca/binding/corba/testing/arrays_unions/ArraysUnionsTests:1.0"};
+
+ public String[] _ids ()
+ {
+ return (String[])__ids.clone ();
+ }
+
+ private void readObject (java.io.ObjectInputStream s) throws java.io.IOException
+ {
+ String str = s.readUTF ();
+ String[] args = null;
+ java.util.Properties props = null;
+ org.omg.CORBA.Object obj = org.omg.CORBA.ORB.init (args, props).string_to_object (str);
+ org.omg.CORBA.portable.Delegate delegate = ((org.omg.CORBA.portable.ObjectImpl) obj)._get_delegate ();
+ _set_delegate (delegate);
+ }
+
+ private void writeObject (java.io.ObjectOutputStream s) throws java.io.IOException
+ {
+ String[] args = null;
+ java.util.Properties props = null;
+ String str = org.omg.CORBA.ORB.init (args, props).object_to_string (this);
+ s.writeUTF (str);
+ }
+} // class _ArraysUnionsTestsStub
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-gdata-gsoc:671193
+/tuscany/branches/sca-java-1.x/modules/binding-gdata:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-gdata-runtime-gsoc:671193
+/tuscany/branches/sca-java-1.x/modules/binding-gdata-runtime:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/ConsumerProviderTestCase.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata-runtime/src/test/java/org/apache/tuscany/sca/binding/gdata/GoogleBloggerServiceTestCase.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata-runtime/src/test/resources/log4j.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-gdata-runtime-gsoc/src/log4j.properties:671193
+/tuscany/branches/sca-java-1.x/modules/binding-gdata-runtime/src/test/resources/log4j.properties:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-gdata:671193
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-gdata-runtime:671193
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2-runtime:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingInvoker.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataBindingProviderFactory.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2-runtime/src/main/java/org/apache/tuscany/sca/binding/gdata/provider/GDataReferenceBindingProvider.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2-runtime/src/test/resources/org/apache/tuscany/sca/binding/gdata:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBinding.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2/src/main/java/org/apache/tuscany/sca/binding/gdata/GDataBindingFactory.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2/src/main/java/org/apache/tuscany/sca/binding/gdata/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2/src/main/java/org/apache/tuscany/sca/binding/gdata/impl:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-gdata2/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-gdata2/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.gdata.GDataBindingFactory:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/DefaultJMSBindingListener.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/binding-jms-runtime/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactoryImpl.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/bean/TestBean.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/Echo.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoBusinessException.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/binding-jsonrpc-runtime/src/test/java/echo/EchoComponentImpl.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-rmi-runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-rmi:671193
+/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvokerFactory.java:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceBindingProvider.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIReferenceInvoker.java:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIReferenceInvoker.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIService.java:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/binding-rmi-runtime/src/main/java/org/apache/tuscany/sca/binding/rmi/provider/RMIServiceBindingProvider.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/RMIBinding.java:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/binding-rmi/src/main/java/org/apache/tuscany/sca/binding/rmi/impl/RMIBindingImpl.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/contribution-impl/src/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/contribution-impl/src/main:671193
-/tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main:723588
+/tuscany/branches/sca-java-1.x/modules/contribution-impl/src/main:723588,724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/contribution-jee/src/test/resources/sample-web-app.war
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/contribution-jee/src/test/resources/sample-web-app.war:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/DefaultUnknownElementProcessor.java:671193
+/tuscany/branches/sca-java-1.x/modules/contribution-xml/src/main/java/org/apache/tuscany/sca/contribution/processor/xml/AnyElementProcessor.java:724111-724120
Modified: tuscany/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java (original)
+++ tuscany/branches/sca-java-1.4/modules/contribution/src/main/java/org/apache/tuscany/sca/contribution/processor/TuscanyNamespaceContext.java Mon Dec 8 06:06:56 2008
@@ -1,124 +1,142 @@
-package org.apache.tuscany.sca.contribution.processor;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Stack;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-
-@SuppressWarnings("unused")
-public class TuscanyNamespaceContext implements NamespaceContext {
-
- private Stack<ArrayList<ArrayList<String>>> context = null;
-
- public TuscanyNamespaceContext(Stack<ArrayList<ArrayList<String>>> context){
- this.context = context;
- }
-
- public String getNamespaceURI(String prefix) {
- if (prefix == null) {
- throw new IllegalArgumentException();
- }
- return (String) getResult("getNSUri",prefix);
- }
-
- public String getPrefix(String namespaceURI) {
- if (namespaceURI == null) {
- throw new IllegalArgumentException();
- }
- return (String) getResult("getPrefix",namespaceURI);
- }
-
- @SuppressWarnings("unchecked")
- public Iterator<String> getPrefixes(String namespaceURI) {
- if (namespaceURI == null) {
- throw new IllegalArgumentException();
- }
-
- Iterator<String> iterator = new Itr<String>((Iterator<String>) getResult("getPrefixes",namespaceURI));
- return iterator;
- }
-
- /*
- * Generic method to Iterate through the Stack and return required result(s)
- */
- private Object getResult(String operation,String arg){
-
- ArrayList<ArrayList<String>> contextList = null;
- Iterator<String> prefItr = null;
- Iterator<String> uriItr = null;
-
- List<String> list = new ArrayList<String>();;
-
- String toCompare = null;
-
- String tempPrefix = null;
- String tempUri = null ;
-
- for(int i = context.size()-1; i>=0;i--){
- contextList = context.get(i);
- prefItr = ((ArrayList<String>)contextList.get(0)).iterator();
- uriItr = ((ArrayList<String>)contextList.get(1)).iterator();
- for(int j = 0;uriItr.hasNext();j++){
- tempPrefix = (String) prefItr.next();
- tempUri = (String) uriItr.next();
- if(operation.equalsIgnoreCase("getNSUri")){
- toCompare = tempPrefix;
- }
- else if(operation.equalsIgnoreCase("getPrefix")){
- toCompare = tempUri;
- }
- else if(operation.equalsIgnoreCase("getPrefixes")){
- toCompare = tempUri;
- }
- if(toCompare != null && arg.equalsIgnoreCase(toCompare)){
- if(operation.equalsIgnoreCase("getNSUri")){
- return tempUri;
- }
- else if(operation.equalsIgnoreCase("getPrefix")){
- return tempPrefix;
- }
- else if(operation.equalsIgnoreCase("getPrefixes")){
- list.add(tempPrefix);
-
- }
-
- }
- }
- }
-
- if(operation.equalsIgnoreCase("getPrefixes")){
- return list.iterator();
- }
-
- return null;
- }
-
- /*
- * Custom implementation of the Iterator interface to override the behavior of the remove() method.
- * The iterator should not be modifiable and invocation of the remove() method should throw UnsupportedOperationException.
- */
- private class Itr<E> implements Iterator<E>{
- Iterator<E> iterator = null;
-
- Itr(Iterator<E> inputItr){
- this.iterator = inputItr;
- }
-
- public boolean hasNext() {
- return this.iterator.hasNext();
- }
-
- public E next() {
- return (E) this.iterator.next();
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- } //end of class Itr<E>
-
-
-} //end of Class
+/*
+ * 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.contribution.processor;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Stack;
+
+import javax.xml.XMLConstants;
+import javax.xml.namespace.NamespaceContext;
+
+@SuppressWarnings("unused")
+public class TuscanyNamespaceContext implements NamespaceContext {
+
+ private Stack<ArrayList<ArrayList<String>>> context = null;
+
+ public TuscanyNamespaceContext(Stack<ArrayList<ArrayList<String>>> context){
+ this.context = context;
+ }
+
+ public String getNamespaceURI(String prefix) {
+ if (prefix == null) {
+ throw new IllegalArgumentException();
+ }
+ return (String) getResult("getNSUri",prefix);
+ }
+
+ public String getPrefix(String namespaceURI) {
+ if (namespaceURI == null) {
+ throw new IllegalArgumentException();
+ }
+ return (String) getResult("getPrefix",namespaceURI);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Iterator<String> getPrefixes(String namespaceURI) {
+ if (namespaceURI == null) {
+ throw new IllegalArgumentException();
+ }
+
+ Iterator<String> iterator = new Itr<String>((Iterator<String>) getResult("getPrefixes",namespaceURI));
+ return iterator;
+ }
+
+ /*
+ * Generic method to Iterate through the Stack and return required result(s)
+ */
+ private Object getResult(String operation,String arg){
+
+ ArrayList<ArrayList<String>> contextList = null;
+ Iterator<String> prefItr = null;
+ Iterator<String> uriItr = null;
+
+ List<String> list = new ArrayList<String>();;
+
+ String toCompare = null;
+
+ String tempPrefix = null;
+ String tempUri = null ;
+
+ for(int i = context.size()-1; i>=0;i--){
+ contextList = context.get(i);
+ prefItr = ((ArrayList<String>)contextList.get(0)).iterator();
+ uriItr = ((ArrayList<String>)contextList.get(1)).iterator();
+ for(int j = 0;uriItr.hasNext();j++){
+ tempPrefix = (String) prefItr.next();
+ tempUri = (String) uriItr.next();
+ if(operation.equalsIgnoreCase("getNSUri")){
+ toCompare = tempPrefix;
+ }
+ else if(operation.equalsIgnoreCase("getPrefix")){
+ toCompare = tempUri;
+ }
+ else if(operation.equalsIgnoreCase("getPrefixes")){
+ toCompare = tempUri;
+ }
+ if(toCompare != null && arg.equalsIgnoreCase(toCompare)){
+ if(operation.equalsIgnoreCase("getNSUri")){
+ return tempUri;
+ }
+ else if(operation.equalsIgnoreCase("getPrefix")){
+ return tempPrefix;
+ }
+ else if(operation.equalsIgnoreCase("getPrefixes")){
+ list.add(tempPrefix);
+
+ }
+
+ }
+ }
+ }
+
+ if(operation.equalsIgnoreCase("getPrefixes")){
+ return list.iterator();
+ }
+
+ return null;
+ }
+
+ /*
+ * Custom implementation of the Iterator interface to override the behavior of the remove() method.
+ * The iterator should not be modifiable and invocation of the remove() method should throw UnsupportedOperationException.
+ */
+ private class Itr<E> implements Iterator<E>{
+ Iterator<E> iterator = null;
+
+ Itr(Iterator<E> inputItr){
+ this.iterator = inputItr;
+ }
+
+ public boolean hasNext() {
+ return this.iterator.hasNext();
+ }
+
+ public E next() {
+ return (E) this.iterator.next();
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ } //end of class Itr<E>
+
+
+} //end of Class
Propchange: tuscany/branches/sca-java-1.4/modules/extensibility-equinox/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/extensibility-eclipse:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/extensibility-equinox:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/extensibility/src/main/java/org/apache/tuscany/sca/extensibility/ContextClassLoaderServiceDiscoverer.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/host-corba-jse/src/test/java/org/apache/tuscany/sca/host/corba/testing/DefaultCorbaHostTestCase.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/host-corba/src/main/java/org/apache/tuscany/sca/host/corba/CorbanameURL.java:724111-724120
Modified: tuscany/branches/sca-java-1.4/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java (original)
+++ tuscany/branches/sca-java-1.4/modules/host-openejb/src/main/java/org/apache/tuscany/sca/host/openejb/OpenEJBServer.java Mon Dec 8 06:06:56 2008
@@ -1,127 +1,145 @@
-package org.apache.tuscany.sca.host.openejb;
-
-import java.io.IOException;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-
-import org.apache.openejb.OpenEJB;
-import org.apache.openejb.OpenEJBException;
-import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
-import org.apache.openejb.config.ConfigurationFactory;
-import org.apache.openejb.core.ServerFederation;
-import org.apache.openejb.jee.EjbJar;
-import org.apache.openejb.jee.StatelessBean;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.server.ServiceDaemon;
-import org.apache.openejb.server.ServiceException;
-import org.apache.openejb.server.ejbd.EjbServer;
-import org.apache.tuscany.sca.host.ejb.EJBHost;
-import org.apache.tuscany.sca.host.ejb.EJBRegistrationException;
-import org.apache.tuscany.sca.host.ejb.EJBSessionBean;
-
-/**
- * OpenEJB-based EJB host implementation.
- *
- * @version $Rev: $ $Date: $
- */
-public class OpenEJBServer implements EJBHost {
-
- private boolean started;
- private EjbServer ejbServer;
- private ServiceDaemon serviceDaemon;
- private ConfigurationFactory config;
- private Assembler assembler;
-
- public void addSessionBean(String ejbName, EJBSessionBean sessionBean) throws EJBRegistrationException {
- if (!started) {
- start();
- }
-
- try {
- StatelessBean bean = new StatelessBean(ejbName, sessionBean.getImplementationClass());
- bean.addBusinessRemote(sessionBean.getRemoteInterface().getName());
- bean.addPostConstruct("init");
- bean.addPreDestroy("destroy");
-
- EjbJar ejbJar = new EjbJar();
- ejbJar.addEnterpriseBean(bean);
-
- assembler.createApplication(config.configureApplication(ejbJar));
-
- } catch (NamingException e) {
- throw new EJBRegistrationException(e);
- } catch (IOException e) {
- throw new EJBRegistrationException(e);
- } catch (OpenEJBException e) {
- throw new EJBRegistrationException(e);
- }
- }
-
- public EJBSessionBean getSessionBean(String ejbName) throws EJBRegistrationException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public EJBSessionBean removeSessionBean(String ejbName) throws EJBRegistrationException {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * Start the OpenEJB server.
- *
- * @throws EJBRegistrationException
- */
- private void start() throws EJBRegistrationException {
- try {
- Properties properties = new Properties();
- properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
- properties.put(Context.PROVIDER_URL, "ejbd://localhost:2888");
- SystemInstance.init(properties);
-
- ejbServer = new EjbServer();
- SystemInstance.get().setComponent(EjbServer.class, ejbServer);
- OpenEJB.init(properties, new ServerFederation());
- ejbServer.init(properties);
-
- serviceDaemon = new ServiceDaemon(ejbServer, 2888, "localhost");
- serviceDaemon.start();
-
- config = new ConfigurationFactory();
- assembler = (Assembler)SystemInstance.get().getComponent(org.apache.openejb.spi.Assembler.class);
-
- // containers
- StatelessSessionContainerInfo statelessContainerInfo = config.configureService(StatelessSessionContainerInfo.class);
- statelessContainerInfo.properties.setProperty("TimeOut", "10");
- statelessContainerInfo.properties.setProperty("PoolSize", "0");
- statelessContainerInfo.properties.setProperty("StrictPooling", "false");
- assembler.createContainer(statelessContainerInfo);
-
- } catch (OpenEJBException e) {
- throw new EJBRegistrationException(e);
- } catch (Exception e) {
- throw new EJBRegistrationException(e);
- }
-
- started = true;
- }
-
- /**
- * Stop the OpenEJB server.
- */
- void stop() {
- if (started) {
- try {
- serviceDaemon.stop();
- } catch (ServiceException e) {
- throw new EJBRegistrationException(e);
- }
- }
- SystemInstance.get().removeComponent(EjbServer.class);
- OpenEJB.destroy();
- }
-
-}
+/*
+ * 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.host.openejb;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+
+import org.apache.openejb.OpenEJB;
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.assembler.classic.Assembler;
+import org.apache.openejb.assembler.classic.StatelessSessionContainerInfo;
+import org.apache.openejb.config.ConfigurationFactory;
+import org.apache.openejb.core.ServerFederation;
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.StatelessBean;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.server.ServiceDaemon;
+import org.apache.openejb.server.ServiceException;
+import org.apache.openejb.server.ejbd.EjbServer;
+import org.apache.tuscany.sca.host.ejb.EJBHost;
+import org.apache.tuscany.sca.host.ejb.EJBRegistrationException;
+import org.apache.tuscany.sca.host.ejb.EJBSessionBean;
+
+/**
+ * OpenEJB-based EJB host implementation.
+ *
+ * @version $Rev: $ $Date: $
+ */
+public class OpenEJBServer implements EJBHost {
+
+ private boolean started;
+ private EjbServer ejbServer;
+ private ServiceDaemon serviceDaemon;
+ private ConfigurationFactory config;
+ private Assembler assembler;
+
+ public void addSessionBean(String ejbName, EJBSessionBean sessionBean) throws EJBRegistrationException {
+ if (!started) {
+ start();
+ }
+
+ try {
+ StatelessBean bean = new StatelessBean(ejbName, sessionBean.getImplementationClass());
+ bean.addBusinessRemote(sessionBean.getRemoteInterface().getName());
+ bean.addPostConstruct("init");
+ bean.addPreDestroy("destroy");
+
+ EjbJar ejbJar = new EjbJar();
+ ejbJar.addEnterpriseBean(bean);
+
+ assembler.createApplication(config.configureApplication(ejbJar));
+
+ } catch (NamingException e) {
+ throw new EJBRegistrationException(e);
+ } catch (IOException e) {
+ throw new EJBRegistrationException(e);
+ } catch (OpenEJBException e) {
+ throw new EJBRegistrationException(e);
+ }
+ }
+
+ public EJBSessionBean getSessionBean(String ejbName) throws EJBRegistrationException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public EJBSessionBean removeSessionBean(String ejbName) throws EJBRegistrationException {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * Start the OpenEJB server.
+ *
+ * @throws EJBRegistrationException
+ */
+ private void start() throws EJBRegistrationException {
+ try {
+ Properties properties = new Properties();
+ properties.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.RemoteInitialContextFactory");
+ properties.put(Context.PROVIDER_URL, "ejbd://localhost:2888");
+ SystemInstance.init(properties);
+
+ ejbServer = new EjbServer();
+ SystemInstance.get().setComponent(EjbServer.class, ejbServer);
+ OpenEJB.init(properties, new ServerFederation());
+ ejbServer.init(properties);
+
+ serviceDaemon = new ServiceDaemon(ejbServer, 2888, "localhost");
+ serviceDaemon.start();
+
+ config = new ConfigurationFactory();
+ assembler = (Assembler)SystemInstance.get().getComponent(org.apache.openejb.spi.Assembler.class);
+
+ // containers
+ StatelessSessionContainerInfo statelessContainerInfo = config.configureService(StatelessSessionContainerInfo.class);
+ statelessContainerInfo.properties.setProperty("TimeOut", "10");
+ statelessContainerInfo.properties.setProperty("PoolSize", "0");
+ statelessContainerInfo.properties.setProperty("StrictPooling", "false");
+ assembler.createContainer(statelessContainerInfo);
+
+ } catch (OpenEJBException e) {
+ throw new EJBRegistrationException(e);
+ } catch (Exception e) {
+ throw new EJBRegistrationException(e);
+ }
+
+ started = true;
+ }
+
+ /**
+ * Stop the OpenEJB server.
+ */
+ void stop() {
+ if (started) {
+ try {
+ serviceDaemon.stop();
+ } catch (ServiceException e) {
+ throw new EJBRegistrationException(e);
+ }
+ }
+ SystemInstance.get().removeComponent(EjbServer.class);
+ OpenEJB.destroy();
+ }
+
+}
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/implementation-bpel-ode/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/provider:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 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/branches/sca-java-1.x/modules/implementation-bpel-ode/src/test/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServerTestCase.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-openjpa/
('svn:mergeinfo' removed)
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/OSGiImplementation.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/impl/OSGiImplementationImpl.java:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/main/java/org/apache/tuscany/sca/implementation/osgi/runtime:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/implementation-osgi/src/test/java/org/apache/tuscany/sca/implementation/osgi/runtime:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/node-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-api:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/node-api:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/node-impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-impl:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/node-impl:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/node-launcher/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/node-launcher:724111-724120
Modified: tuscany/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java (original)
+++ tuscany/branches/sca-java-1.4/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxLauncherBundleHelper.java Mon Dec 8 06:06:56 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.node.equinox.launcher;
import java.io.ByteArrayInputStream;
Propchange: tuscany/branches/sca-java-1.4/modules/node-launcher-osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher-osgi:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/node-launcher-osgi:724111-724120
Modified: tuscany/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java (original)
+++ tuscany/branches/sca-java-1.4/modules/node-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java Mon Dec 8 06:06:56 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.node.osgi.launcher;
import java.io.ByteArrayInputStream;
Propchange: tuscany/branches/sca-java-1.4/modules/node-launcher-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/modules/node2-launcher-webapp:671193,680620-680628
+/tuscany/branches/sca-java-1.x/modules/node-launcher-webapp:724111-724120
Propchange: tuscany/branches/sca-java-1.4/modules/tracing-aspectj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.x/modules/tracing-aspectj:724111-724120
Modified: tuscany/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat (original)
+++ tuscany/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat Mon Dec 8 06:06:56 2008
@@ -1,4 +1,21 @@
@echo off
+REM Licensed to the Apache Software Foundation (ASF) under one
+REM or more contributor license agreements. See the NOTICE file
+REM distributed with this work for additional information
+REM regarding copyright ownership. The ASF licenses this file
+REM to you under the Apache License, Version 2.0 (the
+REM "License"); you may not use this file except in compliance
+REM with the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing,
+REM software distributed under the License is distributed on an
+REM # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+REM KIND, either express or implied. See the License for the
+REM specific language governing permissions and limitations
+REM under the License.
+
set TUSCANY_HOME=C:\Apache\tuscany-sca-1.3
set ASPECTJ_WEAVER=%HOMEPATH%\.m2\repository\org\aspectj\aspectjweaver\1.6.1\aspectjweaver-1.6.1.jar
set CP=%ASPECTJ_WEAVER%;%TUSCANY_HOME%\lib\tuscany-sca-manifest.jar;%TUSCANY_HOME%\samples\calculator\target\sample-calculator.jar
Propchange: tuscany/branches/sca-java-1.4/modules/tracing-aspectj/launcher.bat
('svn:mergeinfo' removed)
Propchange: tuscany/branches/sca-java-1.4/modules/tracing-aspectj/src/main/java/org/apache/tuscany/sca/aspectj/SimpleTracingAspect.java
('svn:mergeinfo' removed)
Propchange: tuscany/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/
('svn:mergeinfo' removed)
Modified: tuscany/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml?rev=724350&r1=724349&r2=724350&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml (original)
+++ tuscany/branches/sca-java-1.4/modules/tracing-aspectj/src/main/resources/META-INF/aop.xml Mon Dec 8 06:06:56 2008
@@ -1,3 +1,21 @@
+<!--
+ * 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.
+-->
<aspectj>
<aspects>
Propchange: tuscany/branches/sca-java-1.4/samples/customer-dojo-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/customer-dojo:671193
+/tuscany/branches/sca-java-1.x/samples/customer-dojo-webapp:724111-724120
Propchange: tuscany/branches/sca-java-1.4/samples/photo-gallery/src/main/java/launch/LaunchGallery.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1 @@
-/tuscany/branches/sca-java-1.x/samples/photo-gallery/src/main/java/launch/LaunchGallery.java:723564,723595
+/tuscany/branches/sca-java-1.x/samples/photo-gallery/src/main/java/launch/LaunchGallery.java:723564,723595,724111-724120
Propchange: tuscany/branches/sca-java-1.4/samples/photo-gallery/src/main/resources/gallery.html
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/samples/photo-gallery/src/main/resources/uiservices/gallery.html:671193
-/tuscany/branches/sca-java-1.x/samples/photo-gallery/src/main/resources/gallery.html:723564,723595
+/tuscany/branches/sca-java-1.x/samples/photo-gallery/src/main/resources/gallery.html:723564,723595,724111-724120
Propchange: tuscany/branches/sca-java-1.4/tutorials/store/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 8 06:06:56 2008
@@ -1 +1,2 @@
/tuscany/branches/sca-java-1.3/tutorial:671193
+/tuscany/branches/sca-java-1.x/tutorials/store:724111-724120