openejb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r453996 - in /incubator/openejb/trunk/openejb3/server/openejb-server: pom.xml src/main/java/org/apache/openejb/server/Server.java src/main/java/org/apache/openejb/server/ServiceManager.java src/main/resources/META-INF/openejb-server.xml
Date Sat, 07 Oct 2006 19:31:23 GMT
Author: jlaskowski
Date: Sat Oct  7 12:31:23 2006
New Revision: 453996

URL: http://svn.apache.org/viewvc?view=rev&rev=453996
Log:
Enable XBean mapping so shorter yet informative names are used in configuration 

Modified:
    incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
    incubator/openejb/trunk/openejb3/server/openejb-server/src/main/resources/META-INF/openejb-server.xml

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml?view=diff&rev=453996&r1=453995&r2=453996
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml (original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/pom.xml Sat Oct  7 12:31:23 2006
@@ -1,34 +1,74 @@
+<!--
+    
+    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.
+    
+-->
+
+<!-- $Rev$ $Date$ -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>server</artifactId>
-    <groupId>org.apache.openejb</groupId>
-    <version>3.0-incubating-SNAPSHOT</version>
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>server</artifactId>
+        <groupId>org.apache.openejb</groupId>
+        <version>3.0-incubating-SNAPSHOT</version>
     </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>openejb-server</artifactId>
-  <packaging>jar</packaging>
-  <name>OpenEJB :: Server :: Core</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-core</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openejb</groupId>
-      <artifactId>openejb-client</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.xbean</groupId>
-      <artifactId>xbean-finder</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>openejb-server</artifactId>
+    <packaging>jar</packaging>
+    <name>OpenEJB :: Server :: Core</name>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>maven-xbean-plugin</artifactId>
+                <version>2.7-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>mapping</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <namespace>http://openejb.apache.org/schemas/server</namespace>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-finder</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java?view=diff&rev=453996&r1=453995&r2=453996
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
(original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/Server.java
Sat Oct  7 12:31:23 2006
@@ -26,9 +26,7 @@
 import org.apache.openejb.util.SafeToolkit;
 
 /**
- * @org.apache.xbean.XBean 
- *   namespace="http://openejb.apache.org/schemas/openejb" 
- *   element="server"
+ * @org.apache.xbean.XBean element="server"
  *   description="OpenEJB Server"
  * 
  * @version $Rev$ $Date$

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java?view=diff&rev=453996&r1=453995&r2=453996
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
(original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java
Sat Oct  7 12:31:23 2006
@@ -34,6 +34,13 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.ArrayList;
+
+/**
+ * @org.apache.xbean.XBean 
+ *   element="serviceManager"
+ * 
+ * @version $Rev$ $Date$
+ */
 public class ServiceManager {
 
     static Messages messages = new Messages("org.apache.openejb.server.util.resources");

Modified: incubator/openejb/trunk/openejb3/server/openejb-server/src/main/resources/META-INF/openejb-server.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/server/openejb-server/src/main/resources/META-INF/openejb-server.xml?view=diff&rev=453996&r1=453995&r2=453996
==============================================================================
--- incubator/openejb/trunk/openejb3/server/openejb-server/src/main/resources/META-INF/openejb-server.xml
(original)
+++ incubator/openejb/trunk/openejb3/server/openejb-server/src/main/resources/META-INF/openejb-server.xml
Sat Oct  7 12:31:23 2006
@@ -1,30 +1,27 @@
-<?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.
-	
+
+    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.
+    
 -->
 
 <!-- $Rev$ $Date$ -->
 
-<beans>
-	<!-- TODO: Use the following definition - truely XBean-ized one -->
-	<!--  server xmlns="http://openejb.apache.org/schemas/core" / -->
-	<bean id="server" class="org.apache.openejb.server.Server">
-		<property name="serviceManager" ref="serviceManager" />
-	</bean>
-	<bean id="serviceManager" class="org.apache.openejb.server.ServiceManager" factory-method="getManager"
/>
+<beans xmlns:o="http://openejb.apache.org/schemas/server">
+    <o:server id="server">
+        <property name="serviceManager" ref="serviceManager" />
+    </o:server>
+    <bean id="serviceManager" class="org.apache.openejb.server.ServiceManager" factory-method="getManager"
/>
 </beans>



Mime
View raw message