Return-Path: 
 <tuscany-commits-return-15463-apmail-ws-tuscany-commits-archive=ws.apache.org@ws.apache.org>
Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org
Received: (qmail 85482 invoked from network); 4 Apr 2008 18:19:36 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 4 Apr 2008 18:19:36 -0000
Received: (qmail 81902 invoked by uid 500); 4 Apr 2008 18:19:36 -0000
Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org
Received: (qmail 81882 invoked by uid 500); 4 Apr 2008 18:19:36 -0000
Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:tuscany-commits-help@ws.apache.org>
List-Unsubscribe: <mailto:tuscany-commits-unsubscribe@ws.apache.org>
List-Post: <mailto:tuscany-commits@ws.apache.org>
List-Id: <tuscany-commits.ws.apache.org>
Reply-To: tuscany-dev@ws.apache.org
Delivered-To: mailing list tuscany-commits@ws.apache.org
Received: (qmail 81873 invoked by uid 99); 4 Apr 2008 18:19:36 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 11:19:36 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Apr 2008 18:18:42 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 0B5A31A9832; Fri,  4 Apr 2008 11:19:02 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r644808 - in
 /incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb: ./
 src/main/java/client/ src/main/resources/META-INF/ src/test/ src/test/java/
 src/test/java/client/ src/test/java/org/ src/test/java/org/omg/
 src/test/java/org/omg...
Date: Fri, 04 Apr 2008 18:19:00 -0000
To: tuscany-commits@ws.apache.org
From: rfeng@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080404181902.0B5A31A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rfeng
Date: Fri Apr  4 11:18:55 2008
New Revision: 644808

URL: http://svn.apache.org/viewvc?rev=644808&view=rev
Log:
Merged a few changes from trunk to enable EJB deployment

Added:
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/client/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/client/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/client/CatalogEJBClientTestCase.java
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBHome_Stub.java
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_EJBObject_Stub.java
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_Handle_Stub.java
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/org/omg/stub/javax/ejb/_HomeHandle_Stub.java
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/services/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/services/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/services/ejb/
      - copied from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/services/ejb/
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBHome_Stub.java
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
      - copied unchanged from r644802, incubator/tuscany/java/sca/tutorial/catalog-ejb/src/test/java/services/ejb/_CatalogEJBRemote_Stub.java
Removed:
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/java/client/
Modified:
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml
    incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml

Modified: incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml?rev=644808&r1=644807&r2=644808&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/pom.xml Fri Apr  4 11:18:55 2008
@@ -40,6 +40,13 @@
             <artifactId>geronimo-ejb_3.0_spec</artifactId>
             <version>1.0</version>
             <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=644808&r1=644807&r2=644808&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ incubator/tuscany/branches/sca-java-1.2/tutorial/catalog-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Apr  4 11:18:55 2008
@@ -1,75 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-	Licensed to the Apache Software Foundation (ASF) under one or more
-	contributor license agreements.  See the NOTICE file distributed with
-	this work for additional information regarding copyright ownership.
-	The ASF licenses this file to You under the Apache License, Version 2.0
-	(the "License"); you may not use this file except in compliance with
-	the License.  You may obtain a copy of the License at
-	
-	http://www.apache.org/licenses/LICENSE-2.0
-	
-	Unless required by applicable law or agreed to in writing, software
-	distributed under the License is distributed on an "AS IS" BASIS,
-	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-	See the License for the specific language governing permissions and
-	limitations under the License.
--->
-<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-	xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.1"
-	xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
-	xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-	xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-	<sys:environment>
-		<sys:moduleId>
-			<sys:groupId>${pom.groupId}</sys:groupId>
-			<sys:artifactId>${pom.artifactId}</sys:artifactId>
-			<sys:version>${version}</sys:version>
-			<sys:type>jar</sys:type>
-		</sys:moduleId>
-		<sys:dependencies>
-			<sys:dependency>
-				<sys:groupId>org.apache.geronimo.configs</sys:groupId>
-				<sys:artifactId>j2ee-corba-yoko</sys:artifactId>
-				<sys:version>2.1</sys:version>
-				<sys:type>car</sys:type>
-			</sys:dependency>
-		</sys:dependencies>
-	</sys:environment>
-
-	<enterprise-beans>
-		<session>
-			<ejb-name>VegetablesCatalogEJB</ejb-name>
-			<jndi-name>VegetablesCatalogEJB</jndi-name>
-			<tss-link>IdentityTokenNoSecurity</tss-link>
-		</session>
-	</enterprise-beans>
-
-	<gbean name="IdentityTokenNoSecurity"
-		class="org.apache.geronimo.corba.TSSBeanGBean">
-		<attribute name="POAName">IdentityTokenNoSecurity</attribute>
-		<reference name="Server">
-			<name>UnprotectedServer</name>
-		</reference>
-		<xml-attribute name="tssConfig">
-			<tss:tss
-				xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
-				xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
-				<tss:compoundSecMechTypeList>
-					<tss:compoundSecMech>
-						<tss:sasMech>
-							<tss:identityTokenTypes>
-								<tss:ITTAnonymous />
-								<tss:ITTPrincipalNameGSSUP
-									principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />
-								<tss:ITTDistinguishedName />
-								<tss:ITTX509CertChain />
-							</tss:identityTokenTypes>
-						</tss:sasMech>
-					</tss:compoundSecMech>
-				</tss:compoundSecMechTypeList>
-			</tss:tss>
-		</xml-attribute>
-	</gbean>
-
-</openejb-jar>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <sys:environment>
+        <sys:moduleId>
+            <sys:groupId>${pom.groupId}</sys:groupId>
+            <sys:artifactId>${pom.artifactId}</sys:artifactId>
+            <sys:version>${version}</sys:version>
+            <sys:type>jar</sys:type>
+        </sys:moduleId>
+        <sys:dependencies>
+            <sys:dependency>
+                <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+                <sys:artifactId>j2ee-corba-yoko</sys:artifactId>
+                <!-- 
+                <sys:version>2.0.2</sys:version>
+                 -->
+                <sys:type>car</sys:type>
+            </sys:dependency>
+        </sys:dependencies>
+        <sys:hidden-classes />
+        <sys:non-overridable-classes />
+    </sys:environment>
+
+    <enterprise-beans>
+        <session>
+            <ejb-name>VegetablesCatalogEJB</ejb-name>
+            <jndi-name>VegetablesCatalogEJB</jndi-name>
+            <tss-link>IdentityTokenNoSecurity</tss-link>
+        </session>
+    </enterprise-beans>
+
+    <!--
+        NOTE: for geronimo 2.0.2, please make sure the following system module is started
+        before the deployment of the EJB jar 
+        org.apache.geronimo.configs/openejb-corba-deployer/2.0.2/car   
+    -->
+    <gbean name="IdentityTokenNoSecurity" class="org.apache.geronimo.corba.TSSBean">
+        <attribute name="POAName">IdentityTokenNoSecurity</attribute>
+        <reference name="Server">
+            <name>UnprotectedServer</name>
+        </reference>
+        <xml-attribute name="tssConfig">
+            <tss:tss xmlns:tss="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
+                xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
+                <tss:compoundSecMechTypeList>
+                    <tss:compoundSecMech>
+                        <tss:sasMech>
+                            <tss:identityTokenTypes>
+                                <tss:ITTAnonymous />
+                                <tss:ITTPrincipalNameGSSUP
+                                    principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" />
+                                <tss:ITTDistinguishedName />
+                                <tss:ITTX509CertChain />
+                            </tss:identityTokenTypes>
+                        </tss:sasMech>
+                    </tss:compoundSecMech>
+                </tss:compoundSecMechTypeList>
+            </tss:tss>
+        </xml-attribute>
+    </gbean>
+</openejb-jar>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org