You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/10 05:03:14 UTC
svn commit: r494700 - in
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main:
java/org/apache/openejb/alt/config/ java/org/apache/openejb/alt/config/sys/
resources/META-INF/org.apache.openejb/ resources/schema/
Author: dblevins
Date: Tue Jan 9 20:03:13 2007
New Revision: 494700
URL: http://svn.apache.org/viewvc?view=rev&rev=494700
Log:
Renaming the TransactionService config element to TransactionManager
Added:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManager.java (contents, props changed)
- copied, changed from r494698, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManagerDescriptor.java (contents, props changed)
- copied, changed from r494698, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java
Removed:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/Openejb.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/OpenejbDescriptor.java
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb.xsd
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java?view=diff&rev=494700&r1=494699&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/ConfigurationFactory.java Tue Jan 9 20:03:13 2007
@@ -27,7 +27,7 @@
import org.apache.openejb.alt.config.sys.ProxyFactory;
import org.apache.openejb.alt.config.sys.SecurityService;
import org.apache.openejb.alt.config.sys.ServiceProvider;
-import org.apache.openejb.alt.config.sys.TransactionService;
+import org.apache.openejb.alt.config.sys.TransactionManager;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.ClientInfo;
import org.apache.openejb.assembler.classic.ConnectionManagerInfo;
@@ -278,7 +278,7 @@
private void initTransactionService(Openejb openejb, FacilitiesInfo facilities) throws OpenEJBException {
- facilities.transactionService = createService(openejb.getTransactionService(), new TransactionServiceInfo(), DEFAULT_TRANSACTION_MANAGER, TransactionService.class);
+ facilities.transactionService = createService(openejb.getTransactionService(), new TransactionServiceInfo(), DEFAULT_TRANSACTION_MANAGER, TransactionManager.class);
}
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/Openejb.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/Openejb.java?view=diff&rev=494700&r1=494699&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/Openejb.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/Openejb.java Tue Jan 9 20:03:13 2007
@@ -1,19 +1,19 @@
-/**
- * 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.
- */
+/**
+ * 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.
+ */
/*
* This class was automatically generated with
* <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -41,7 +41,7 @@
private org.apache.openejb.alt.config.sys.SecurityService _securityService;
- private org.apache.openejb.alt.config.sys.TransactionService _transactionService;
+ private org.apache.openejb.alt.config.sys.TransactionManager _transactionManager;
private org.apache.openejb.alt.config.sys.ConnectionManager _connectionManager;
@@ -266,8 +266,8 @@
return this._securityService;
}
- public org.apache.openejb.alt.config.sys.TransactionService getTransactionService() {
- return this._transactionService;
+ public org.apache.openejb.alt.config.sys.TransactionManager getTransactionService() {
+ return this._transactionManager;
}
public boolean isValid() {
@@ -443,8 +443,8 @@
this._securityService = securityService;
}
- public void setTransactionService(org.apache.openejb.alt.config.sys.TransactionService transactionService) {
- this._transactionService = transactionService;
+ public void setTransactionService(org.apache.openejb.alt.config.sys.TransactionManager transactionManager) {
+ this._transactionManager = transactionManager;
}
public static java.lang.Object unmarshal(java.io.Reader reader)
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/OpenejbDescriptor.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/OpenejbDescriptor.java?view=diff&rev=494700&r1=494699&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/OpenejbDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/OpenejbDescriptor.java Tue Jan 9 20:03:13 2007
@@ -1,19 +1,19 @@
-/**
- * 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.
- */
+/**
+ * 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.
+ */
/*
* This class was automatically generated with
* <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -189,7 +189,7 @@
}
desc.setValidator(fieldValidator);
- desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.TransactionService.class, "_transactionService", "TransactionService", org.exolab.castor.xml.NodeType.Element);
+ desc = new org.exolab.castor.xml.util.XMLFieldDescriptorImpl(org.apache.openejb.alt.config.sys.TransactionManager.class, "_transactionService", "TransactionService", org.exolab.castor.xml.NodeType.Element);
handler = (new org.exolab.castor.xml.XMLFieldHandler() {
public java.lang.Object getValue(java.lang.Object object)
throws IllegalStateException {
@@ -201,7 +201,7 @@
throws IllegalStateException, IllegalArgumentException {
try {
Openejb target = (Openejb) object;
- target.setTransactionService((org.apache.openejb.alt.config.sys.TransactionService) value);
+ target.setTransactionService((org.apache.openejb.alt.config.sys.TransactionManager) value);
}
catch (java.lang.Exception ex) {
throw new IllegalStateException(ex.toString());
@@ -209,7 +209,7 @@
}
public java.lang.Object newInstance(java.lang.Object parent) {
- return new org.apache.openejb.alt.config.sys.TransactionService();
+ return new org.apache.openejb.alt.config.sys.TransactionManager();
}
});
desc.setHandler(handler);
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManager.java (from r494698, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManager.java?view=diff&rev=494700&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java&r1=494698&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManager.java&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionService.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManager.java Tue Jan 9 20:03:13 2007
@@ -1,19 +1,19 @@
-/**
- * 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.
- */
+/**
+ * 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.
+ */
/*
* This class was automatically generated with
* <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -28,7 +28,7 @@
import org.exolab.castor.xml.Marshaller;
import org.exolab.castor.xml.Unmarshaller;
-public class TransactionService implements java.io.Serializable, org.apache.openejb.alt.config.Service {
+public class TransactionManager implements java.io.Serializable, org.apache.openejb.alt.config.Service {
private java.lang.String _id;
@@ -40,7 +40,7 @@
private java.lang.String _content = "";
- public TransactionService() {
+ public TransactionManager() {
super();
setContent("");
}
@@ -102,7 +102,7 @@
public static java.lang.Object unmarshal(java.io.Reader reader)
throws org.exolab.castor.xml.MarshalException, org.exolab.castor.xml.ValidationException {
- return (org.apache.openejb.alt.config.sys.TransactionService) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.TransactionService.class, reader);
+ return (org.apache.openejb.alt.config.sys.TransactionManager) Unmarshaller.unmarshal(org.apache.openejb.alt.config.sys.TransactionManager.class, reader);
}
public void validate()
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManager.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManagerDescriptor.java (from r494698, incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManagerDescriptor.java?view=diff&rev=494700&p1=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java&r1=494698&p2=incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManagerDescriptor.java&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionServiceDescriptor.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManagerDescriptor.java Tue Jan 9 20:03:13 2007
@@ -1,19 +1,19 @@
-/**
- * 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.
- */
+/**
+ * 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.
+ */
/*
* This class was automatically generated with
* <a href="http://www.castor.org">Castor 0.9.5.3</a>, using an XML
@@ -27,7 +27,7 @@
import org.exolab.castor.xml.validators.*;
-public class TransactionServiceDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
+public class TransactionManagerDescriptor extends org.exolab.castor.xml.util.XMLClassDescriptorImpl {
private java.lang.String nsPrefix;
@@ -39,10 +39,10 @@
private org.exolab.castor.xml.XMLFieldDescriptor identity;
- public TransactionServiceDescriptor() {
+ public TransactionManagerDescriptor() {
super();
nsURI = "http://www.openejb.org/System/Configuration";
- xmlName = "TransactionService";
+ xmlName = "TransactionManager";
org.exolab.castor.xml.util.XMLFieldDescriptorImpl desc = null;
org.exolab.castor.xml.XMLFieldHandler handler = null;
org.exolab.castor.xml.FieldValidator fieldValidator = null;
@@ -52,14 +52,14 @@
handler = (new org.exolab.castor.xml.XMLFieldHandler() {
public java.lang.Object getValue(java.lang.Object object)
throws IllegalStateException {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
return target.getContent();
}
public void setValue(java.lang.Object object, java.lang.Object value)
throws IllegalStateException, IllegalArgumentException {
try {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
target.setContent((java.lang.String) value);
}
catch (java.lang.Exception ex) {
@@ -89,14 +89,14 @@
handler = (new org.exolab.castor.xml.XMLFieldHandler() {
public java.lang.Object getValue(java.lang.Object object)
throws IllegalStateException {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
return target.getId();
}
public void setValue(java.lang.Object object, java.lang.Object value)
throws IllegalStateException, IllegalArgumentException {
try {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
target.setId((java.lang.String) value);
}
catch (java.lang.Exception ex) {
@@ -127,14 +127,14 @@
handler = (new org.exolab.castor.xml.XMLFieldHandler() {
public java.lang.Object getValue(java.lang.Object object)
throws IllegalStateException {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
return target.getProvider();
}
public void setValue(java.lang.Object object, java.lang.Object value)
throws IllegalStateException, IllegalArgumentException {
try {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
target.setProvider((java.lang.String) value);
}
catch (java.lang.Exception ex) {
@@ -163,14 +163,14 @@
handler = (new org.exolab.castor.xml.XMLFieldHandler() {
public java.lang.Object getValue(java.lang.Object object)
throws IllegalStateException {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
return target.getJar();
}
public void setValue(java.lang.Object object, java.lang.Object value)
throws IllegalStateException, IllegalArgumentException {
try {
- TransactionService target = (TransactionService) object;
+ TransactionManager target = (TransactionManager) object;
target.setJar((java.lang.String) value);
}
catch (java.lang.Exception ex) {
@@ -212,7 +212,7 @@
}
public java.lang.Class getJavaClass() {
- return org.apache.openejb.alt.config.sys.TransactionService.class;
+ return org.apache.openejb.alt.config.sys.TransactionManager.class;
}
public java.lang.String getNameSpacePrefix() {
Propchange: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/alt/config/sys/TransactionManagerDescriptor.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml?view=diff&rev=494700&r1=494699&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/META-INF/org.apache.openejb/service-jar.xml Tue Jan 9 20:03:13 2007
@@ -240,7 +240,7 @@
-->
<ServiceProvider
id="Default Transaction Manager"
- provider-type="TransactionService"
+ provider-type="TransactionManager"
class-name="org.apache.geronimo.transaction.manager.GeronimoTransactionManager"/>
<!--
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb.xsd
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb.xsd?view=diff&rev=494700&r1=494699&r2=494700
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb.xsd (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/resources/schema/openejb.xsd Tue Jan 9 20:03:13 2007
@@ -93,7 +93,7 @@
<!--
-->
- <xsd:element name="TransactionService">
+ <xsd:element name="TransactionManager">
<xsd:complexType mixed='true'>
<xsd:attribute name="id" type="xsd:string" use="required" />
<xsd:attribute name="provider" type="xsd:string" />
@@ -117,7 +117,7 @@
<xsd:element ref="Container" maxOccurs="unbounded"/>
<xsd:element ref="JndiProvider" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element ref="SecurityService" minOccurs="0" maxOccurs="1"/>
- <xsd:element ref="TransactionService" minOccurs="0" maxOccurs="1"/>
+ <xsd:element ref="TransactionManager" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="ConnectionManager" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="ProxyFactory" minOccurs="0" maxOccurs="1"/>
<xsd:element ref="Connector" minOccurs="0" maxOccurs="unbounded"/>