geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1045108 - in /geronimo/server/trunk: plugingroups/console-jetty/ plugingroups/console-jetty/src/main/history/ plugingroups/console-tomcat/ plugingroups/console-tomcat/src/main/history/ plugins/openejb/ plugins/openejb/openejb-console-jetty...
Date Mon, 13 Dec 2010 13:23:46 GMT
Author: rwonly
Date: Mon Dec 13 13:23:45 2010
New Revision: 1045108

URL: http://svn.apache.org/viewvc?rev=1045108&view=rev
Log:
GERONIMO-5600 Reenable EJB server admin console portlets (Thanks Shenghao for the patch!)

Modified:
    geronimo/server/trunk/plugingroups/console-jetty/pom.xml
    geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/pom.xml

Modified: geronimo/server/trunk/plugingroups/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/pom.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/console-jetty/pom.xml Mon Dec 13 13:23:45 2010
@@ -110,12 +110,12 @@
         </dependency>
         -->
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins</groupId>-->
-            <!--<artifactId>openejb-console-jetty</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>openejb-console-jetty</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/console-jetty/src/main/history/dependencies.xml Mon
Dec 13 13:23:45 2010
@@ -18,6 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb-console-jetty</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>osgi-console-jetty</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/pom.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/console-tomcat/pom.xml Mon Dec 13 13:23:45 2010
@@ -110,12 +110,12 @@
         </dependency>
         -->
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins</groupId>-->
-            <!--<artifactId>openejb-console-tomcat</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>openejb-console-tomcat</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
     </dependencies>
 
     <build>

Modified: geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/console-tomcat/src/main/history/dependencies.xml Mon
Dec 13 13:23:45 2010
@@ -18,6 +18,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>openejb-console-tomcat</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>osgi-console-tomcat</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/pom.xml Mon Dec 13 13:23:45
2010
@@ -33,6 +33,21 @@
     <packaging>car</packaging>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>openejb-portlets</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>${jetty}-deployer</artifactId>
@@ -40,7 +55,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -48,25 +63,17 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>openejb-portlets</artifactId>
+            <artifactId>console-jetty</artifactId>
             <version>${project.version}</version>
-            <type>war</type>
-            <scope>provided</scope>
+            <type>car</type>
         </dependency>
 
-	<dependency>
-           <groupId>org.apache.geronimo.configs</groupId>
-           <artifactId>openejb</artifactId>
-           <version>${project.version}</version>
-           <type>car</type>
-        </dependency>
-	
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-jetty</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
@@ -85,7 +92,7 @@
             <type>car</type>
         </dependency>
 
-    </dependencies> 
+    </dependencies>
 
     <build>
         <plugins>
@@ -106,6 +113,9 @@
                         <type>war</type>
                     </module>
                     <category>Administration</category>
+                    <description>
+                        OpenEJB Server plugin for Jetty
+                    </description>
                     <osiApproved>true</osiApproved>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
Mon Dec 13 13:23:45 2010
@@ -18,6 +18,21 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-main</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
@@ -26,4 +41,14 @@
         <artifactId>console-jetty</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-registry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml Mon
Dec 13 13:23:45 2010
@@ -17,17 +17,10 @@ See the License for the specific languag
 limitations under the License.
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-    
+
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/openejb-server</context-root>
 
-    <!-- i18n support -->
-    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
-        <reference name="ConsoleResourceRegistry">
-            <name>ConsoleResourceRegistry</name>
-        </reference>
-    </gbean>
-
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
@@ -36,14 +29,21 @@ limitations under the License.
             </role>
         </role-mappings>
     </security>
-    
+
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">1-4/Application Server/EJB Server</attribute>
         <attribute name="portletContext">/openejb-server</attribute>
         <attribute name="portletList">[EJBServerPortlet]</attribute>
         <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
-	<reference name="PortalContainerServices">
+        <reference name="PortalContainerServices">
             <name>PlutoPortalServices</name>
         </reference>
     </gbean>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/pom.xml Mon Dec 13 13:23:45
2010
@@ -33,6 +33,21 @@
     <packaging>car</packaging>
 
     <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>openejb-portlets</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat7-deployer</artifactId>
@@ -40,7 +55,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper-deployer</artifactId>
@@ -48,29 +63,21 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>openejb-portlets</artifactId>
+            <artifactId>console-tomcat</artifactId>
             <version>${project.version}</version>
-            <type>war</type>
-            <scope>provided</scope>
+            <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-tomcat</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
-	<dependency>
-           <groupId>org.apache.geronimo.configs</groupId>
-           <artifactId>openejb</artifactId>
-           <version>${project.version}</version>
-           <type>car</type>
-        </dependency>
-	
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>dojo-tomcat</artifactId>
@@ -107,7 +114,7 @@
                     </module>
                     <category>Administration</category>
                     <description>
-                       OpenEJB Server plugin for Tomcat
+                        OpenEJB Server plugin for Tomcat
                     </description>
                     <osiApproved>true</osiApproved>
                     <useMavenDependencies>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
Mon Dec 13 13:23:45 2010
@@ -18,6 +18,21 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-cli</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-deploy-config</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>geronimo-main</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>plugin</artifactId>
         <type>car</type>
     </dependency>
@@ -26,4 +41,14 @@
         <artifactId>console-tomcat</artifactId>
         <type>car</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-osgi-registry</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml Mon
Dec 13 13:23:45 2010
@@ -17,20 +17,13 @@ See the License for the specific languag
 limitations under the License.
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-    
+
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/openejb-server</context-root>
 
     <!-- required for pluto cross context dispatches -->
     <cross-context />
 
-    <!-- i18n support -->
-    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
-        <reference name="ConsoleResourceRegistry">
-            <name>ConsoleResourceRegistry</name>
-        </reference>
-    </gbean>
-
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
@@ -39,14 +32,21 @@ limitations under the License.
             </role>
         </role-mappings>
     </security>
-    
+
+    <!-- i18n support -->
+    <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
+        <reference name="ConsoleResourceRegistry">
+            <name>ConsoleResourceRegistry</name>
+        </reference>
+    </gbean>
+
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">1-4/Application Server/EJB Server</attribute>
         <attribute name="portletContext">/openejb-server</attribute>
         <attribute name="portletList">[EJBServerPortlet]</attribute>
         <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
-	<reference name="PortalContainerServices">
+        <reference name="PortalContainerServices">
             <name>PlutoPortalServices</name>
         </reference>
     </gbean>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Mon Dec 13 13:23:45 2010
@@ -39,14 +39,17 @@
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jsp_2.2_spec</artifactId>
+            <groupId>org.apache.portals</groupId>
+            <artifactId>portlet-api_2.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
+        
         <dependency>
-                <groupId>org.apache.geronimo.bundles</groupId>
-                <artifactId>jstl</artifactId>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>jstl</artifactId>
+            <scope>provided</scope>    
         </dependency>
 
         <dependency>
@@ -59,10 +62,9 @@
 
         <!-- for jspc maven plugin -->
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
+            <groupId>org.apache.portals.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -177,8 +179,8 @@
                 </configuration>
             </plugin>
             <plugin>
-                  <groupId>org.codehaus.mojo</groupId>
-                  <artifactId>native2ascii-maven-plugin</artifactId>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>native2ascii-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/web.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/src/main/webapp/WEB-INF/web.xml
Mon Dec 13 13:23:45 2010
@@ -14,6 +14,7 @@ distributed  under the  License is distr
 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.
 -->
@@ -22,7 +23,7 @@ limitations under the License.
 
     <servlet>
         <servlet-name>EjbServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
         <init-param>
             <param-name>portlet-name</param-name>
             <param-value>EJBServerPortlet</param-value>
@@ -31,23 +32,19 @@ limitations under the License.
     </servlet>
     
     <servlet>
-      <servlet-name>dwr-invoker</servlet-name>
-      <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
-      <init-param>
-          <param-name>debug</param-name>
-	  <param-value>true</param-value>
-      </init-param>
-      <init-param>
-          <param-name>classes</param-name>
-          <param-value>
-              org.apache.geronimo.console.ejbserver.EjbHelper,
-              org.apache.geronimo.console.ejbserver.EjbInformation,
-              org.apache.geronimo.console.util.Tree,
-              org.apache.geronimo.console.util.TreeEntry,
-              org.apache.geronimo.console.message.JSCommonMessage
-          </param-value>
-      </init-param>
-      <load-on-startup>1</load-on-startup>
+        <servlet-name>dwr-invoker</servlet-name>
+        <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
+        <init-param>
+            <param-name>classes</param-name>
+            <param-value>
+                org.apache.geronimo.console.ejbserver.EjbHelper,
+                org.apache.geronimo.console.ejbserver.EjbInformation,
+                org.apache.geronimo.console.util.Tree,
+                org.apache.geronimo.console.util.TreeEntry,
+                org.apache.geronimo.console.message.JSCommonMessage
+            </param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     
     <servlet-mapping>
@@ -58,14 +55,14 @@ limitations under the License.
     <servlet-mapping>
         <servlet-name>dwr-invoker</servlet-name>
         <url-pattern>/dwr6/*</url-pattern>
-    </servlet-mapping>    
+    </servlet-mapping>
 
     <security-constraint>
         <web-resource-collection>
             <web-resource-name>ejb-server</web-resource-name>
-	    <url-pattern>/</url-pattern>
+            <url-pattern>/</url-pattern>
             <url-pattern>/PlutoInvoker/*</url-pattern>
-	    <url-pattern>/dwr6/*</url-pattern>
+            <url-pattern>/dwr6/*</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>
             <http-method>PUT</http-method>

Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Mon Dec
13 13:23:45 2010
@@ -68,11 +68,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ejb_3.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-jaxws_2.2_spec</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/pom.xml?rev=1045108&r1=1045107&r2=1045108&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/pom.xml Mon Dec 13 13:23:45 2010
@@ -40,8 +40,8 @@
         <module>openejb</module>
         <module>openejb-deployer</module>
         <module>openejb-portlets</module>
-        <!--<module>openejb-console-jetty</module>-->
-        <!--<module>openejb-console-tomcat</module>-->
+        <module>openejb-console-jetty</module>
+        <module>openejb-console-tomcat</module>
         <module>openejb-clustering-wadi</module>
         <module>openejb-clustering-builder-wadi</module>
     </modules>
@@ -63,8 +63,8 @@
                 <module>openejb</module>
                 <module>openejb-deployer</module>
                 <module>openejb-portlets</module>
-                <!--<module>openejb-console-jetty</module>-->
-                <!--<module>openejb-console-tomcat</module>-->
+                <module>openejb-console-jetty</module>
+                <module>openejb-console-tomcat</module>
                 <module>openejb-clustering-wadi</module>
                 <module>openejb-clustering-builder-wadi</module>
                 <module>geronimo-openejb-server</module>



Mime
View raw message