geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r570301 - in /geronimo/plugins/system-database: ./ trunk/ trunk/system-database-ear/ trunk/system-database-jetty/ trunk/system-database-jetty/src/main/ trunk/system-database-jetty/src/main/resources/META-INF/ trunk/system-database-jetty/src...
Date Tue, 28 Aug 2007 04:31:17 GMT
Author: pmcmahan
Date: Mon Aug 27 21:31:11 2007
New Revision: 570301

URL: http://svn.apache.org/viewvc?rev=570301&view=rev
Log:
GERONIMO-3413 system database plugin using derby plus admin portlets

Added:
    geronimo/plugins/system-database/
    geronimo/plugins/system-database/trunk/
    geronimo/plugins/system-database/trunk/LICENSE.txt
      - copied unchanged from r568727, geronimo/plugins/console/trunk/LICENSE.txt
    geronimo/plugins/system-database/trunk/NOTICE.txt
      - copied unchanged from r568727, geronimo/plugins/console/trunk/NOTICE.txt
    geronimo/plugins/system-database/trunk/pom.xml
      - copied, changed from r569112, geronimo/plugins/jee-management/trunk/pom.xml
    geronimo/plugins/system-database/trunk/system-database-ear/
      - copied from r568727, geronimo/plugins/console/trunk/console-ear/
    geronimo/plugins/system-database/trunk/system-database-jetty/
      - copied from r569514, geronimo/server/trunk/configs/system-database/
    geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml
      - copied, changed from r569728, geronimo/server/trunk/configs/system-database/pom.xml
    geronimo/plugins/system-database/trunk/system-database-jetty/src/main/
      - copied from r569728, geronimo/server/trunk/configs/system-database/src/main/
    geronimo/plugins/system-database/trunk/system-database-portlets/
    geronimo/plugins/system-database/trunk/system-database-portlets/LICENSE.txt
      - copied unchanged from r568727, geronimo/plugins/console/trunk/LICENSE.txt
    geronimo/plugins/system-database/trunk/system-database-portlets/NOTICE.txt
      - copied unchanged from r568727, geronimo/plugins/console/trunk/NOTICE.txt
    geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml
      - copied, changed from r569103, geronimo/plugins/jee-management/trunk/jee-management-portlets/pom.xml
    geronimo/plugins/system-database/trunk/system-database-portlets/src/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/derbylogmanager/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/internaldb/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml   (with props)
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/derbylogmanager/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/view/internaldb/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/internaldb/
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml   (with props)
Modified:
    geronimo/plugins/system-database/trunk/system-database-ear/pom.xml
    geronimo/plugins/system-database/trunk/system-database-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml
    geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java

Copied: geronimo/plugins/system-database/trunk/pom.xml (from r569112, geronimo/plugins/jee-management/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/pom.xml?p2=geronimo/plugins/system-database/trunk/pom.xml&p1=geronimo/plugins/jee-management/trunk/pom.xml&r1=569112&r2=570301&rev=570301&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/pom.xml Mon Aug 27 21:31:11 2007
@@ -29,20 +29,20 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>jee-management</artifactId>
-    <name>Java EE Management</name>
+    <artifactId>system-database</artifactId>
+    <name>Geronimo System Database</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
     <description>
-        Java EE Management
+        Geronimo System Database
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/jee-management/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/jee-management/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/jee-management/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/system-database/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/system-database/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk</url>
     </scm>
 
     <properties>
@@ -58,9 +58,12 @@
         <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
         <consoleVersion>1.0-SNAPSHOT</consoleVersion>
+        <derbyVersion>10.2.2.0</derbyVersion>
+        <tranqlVersion>1.3</tranqlVersion>
 
         <!-- deployers needed to create the CAR files -->
         <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
         <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
         <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
@@ -71,12 +74,40 @@
         <dependencies>
 
             <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto-support</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
                 <groupId>javax.portlet</groupId>
                 <artifactId>portlet-api</artifactId>
                 <version>1.0</version>
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>connector-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>transaction</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-kernel</artifactId>
                 <version>${geronimoVersion}</version>
@@ -84,6 +115,12 @@
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-timer</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-management</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
@@ -95,6 +132,49 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-converter</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-derby</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derby</artifactId>
+                <version>${derbyVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbyclient</artifactId>
+                <version>${derbyVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.derby</groupId>
+                <artifactId>derbynet</artifactId>
+                <version>${derbyVersion}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.tranql</groupId>
+                <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                <version>${tranqlVersion}</version>
+                <type>rar</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-connector-builder</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.plugins</groupId>
                 <artifactId>console-core</artifactId>
                 <version>${consoleVersion}</version>
@@ -289,9 +369,12 @@
             </activation>
 
             <modules>
-                <module>jee-management-portlets</module>
-                <module>jee-management-tomcat</module>
-                <module>jee-management-jetty</module>
+                <module>system-database-portlets</module>
+                <module>system-database-ear</module>
+<!--
+                <module>system-database-tomcat</module>
+-->
+                <module>system-database-jetty</module>
             </modules>
         </profile>
     </profiles>

Modified: geronimo/plugins/system-database/trunk/system-database-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-ear/pom.xml?rev=570301&r1=568727&r2=570301&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-ear/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-ear/pom.xml Mon Aug 27 21:31:11 2007
@@ -24,29 +24,28 @@
     
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>console</artifactId>
+        <artifactId>system-database</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>console-ear</artifactId>
-    <name>Geronimo Administration Console Plugin :: EAR</name>
+    <artifactId>system-database-ear</artifactId>
+    <name>Geronimo System Database :: EAR</name>
     <packaging>ear</packaging>
     
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-base-portlets</artifactId>
+            <artifactId>system-database-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
         
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-portal-driver</artifactId>
-            <version>${version}</version>
-            <type>war</type>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+            <type>rar</type>
         </dependency>
 
     </dependencies>
@@ -56,6 +55,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-ear-plugin</artifactId>
+                <version>2.3.1</version>
                 <configuration>
                     <displayName>Geronimo Console Application</displayName>
                     <generateApplicationXml>true</generateApplicationXml>
@@ -63,16 +63,16 @@
                     <modules>
                         <webModule>
                             <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>console-base-portlets</artifactId>
-                            <contextRoot>/console</contextRoot>
-                            <bundleFileName>base-portlets.war</bundleFileName>
-                        </webModule>
-                        <webModule>
-                            <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>console-portal-driver</artifactId>
-                            <contextRoot>/pluto</contextRoot>
-                            <bundleFileName>portal-driver.war</bundleFileName>
+                            <artifactId>system-database-portlets</artifactId>
+                            <contextRoot>/system-database</contextRoot>
+                            <bundleFileName>system-database-portlets.war</bundleFileName>
                         </webModule>
+                        <rarModule>
+                            <groupId>org.tranql</groupId>
+                            <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                            <!-- http://jira.codehaus.org/browse/MEAR-68 -->
+                            <!--  alt-dd>deployment/geronimo-ra.xml</alt-dd -->
+                        </rarModule>
                     </modules>
                 </configuration>
             </plugin>

Copied: geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml (from r569728, geronimo/server/trunk/configs/system-database/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml?p2=geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml&p1=geronimo/server/trunk/configs/system-database/pom.xml&r1=569728&r2=570301&rev=570301&view=diff
==============================================================================
--- geronimo/server/trunk/configs/system-database/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-jetty/pom.xml Mon Aug 27 21:31:11 2007
@@ -23,42 +23,32 @@
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
-        <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>configs</artifactId>
-        <version>2.1-SNAPSHOT</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>system-database</artifactId>
+        <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     
-    <artifactId>system-database</artifactId>
-    <name>Geronimo Configs :: System Database</name>
+    <artifactId>system-database-jetty</artifactId>
+    <name>Geronimo System Database :: Jetty Plugin</name>
     <packaging>car</packaging>
     
     <dependencies>
                 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
+        <dependency>    
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
-            <version>${version}</version>
             <type>car</type>
-        </dependency>
-
-        <dependency>
+        </dependency>   
+                        
+        <dependency>    
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-derby</artifactId>
-            <version>${version}</version>
         </dependency>
-
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-timer</artifactId>
-            <version>${version}</version>
         </dependency>
 
         <dependency>
@@ -77,18 +67,32 @@
         </dependency>
 
         <dependency>
-            <groupId>org.tranql</groupId>
-            <artifactId>tranql-connector-derby-embed-xa</artifactId>
-            <type>rar</type>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
-            <version>${version}</version>
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>system-database-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
+            <type>car</type>
+        </dependency>
+
     </dependencies>
     
     <build>
@@ -107,11 +111,13 @@
                         <deploymentConfig>${gbeanDeployer}</deploymentConfig>
                         <deploymentConfig>${j2eeDeployer}</deploymentConfig>
                         <deploymentConfig>${connectorDeployer}</deploymentConfig>
+                        <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
                     </deploymentConfigs>
                     <module>
-                        <groupId>org.tranql</groupId>
-                        <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                        <type>rar</type>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>system-database-ear</artifactId>
+                        <type>ear</type>
                     </module>
                 </configuration>
             </plugin>

Modified: geronimo/plugins/system-database/trunk/system-database-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=570301&r1=569728&r2=570301&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-jetty/src/main/resources/META-INF/geronimo-plugin.xml Mon Aug 27 21:31:11 2007
@@ -20,7 +20,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.2">
     <name>Geronimo System Database plugin</name>
-    <module-id>${pom.groupId}/${pom.artifactId}/${version}/car</module-id>
+    <module-id>org.apache.geronimo.plugins/system-database-jetty/1.0-SNAPSHOT/car</module-id>
     <category>Geronimo</category>
     <description>
         System database plugin for geronimo.  This provides system databse together with its dependencies as one dependency.
@@ -29,35 +29,23 @@
     <author>Apache Software Foundation</author>
     <license osi-approved="true">ASL 2</license>
     <geronimo-versions>
-    	<version>${version}</version>
+    	<version>2.1-SNAPSHOT</version>
     </geronimo-versions>
     <prerequisite>
-        <id>org.apache.geronimo.configs/transaction//car</id>
-        <resource-type>Transaction</resource-type>
+        <id>org.apache.geronimo.plugins/pluto-support/1.0-SNAPSHOT/car</id>
+        <resource-type>Portlet Container</resource-type>
         <description>
-           Transaction configuration for Geronimo.
-        </description>
-    </prerequisite>
-    <prerequisite>
-        <id>org.apache.geronimo.configs/connector-deployer//car</id>
-        <resource-type>Deployment</resource-type>
-        <description>
-           Connector deployer configuration for Geronimo.
-        </description>
-    </prerequisite>
-    <prerequisite>
-        <id>org.apache.geronimo.configs/connector-deployer//car</id>
-        <resource-type>Deployment</resource-type>
-        <description>
-           Connector deployer configuration for Geronimo.
+            The pluto container configuration must be present in order for this
+            plugin to register the web application context for its management portlets.
         </description>
     </prerequisite>
+    <dependency>org.apache.geronimo.configs/connector-deployer//car</dependency>
+    <dependency>org.apache.geronimo.configs/transaction//car</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-derby//jar</dependency>
     <dependency>org.apache.geronimo.modules/geronimo-timer//jar</dependency>
     <dependency>org.apache.derby/derby//jar</dependency>
     <dependency>org.apache.derby/derbynet//jar</dependency>
     <dependency>org.apache.derby/derbyclient//jar</dependency>
-    <dependency>org.tranql/tranql-connector-derby-embed-xa//rar</dependency>
     <source-repository>http://geronimo.apache.org/plugins/geronimo-2.0/repository/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>
 </geronimo-plugin>

Modified: geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml?rev=570301&r1=569514&r2=570301&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-jetty/src/plan/plan.xml Mon Aug 27 21:31:11 2007
@@ -18,84 +18,134 @@
 
 <!-- $Rev$ $Date$ -->
 
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-${geronimoSchemaVersion}">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
 
-    <resourceadapter>
-        <outbound-resourceadapter>
-            <connection-definition>
-                <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
-                <connectiondefinition-instance>
-                    <name>SystemDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <connectionmanager>
-                        <xa-transaction>
-                            <transaction-caching/>
-                        </xa-transaction>
-                        <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <select-one-assume-match/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-                <connectiondefinition-instance>
-                    <name>NoTxDatasource</name>
-                    <config-property-setting name="UserName"></config-property-setting>
-                    <config-property-setting name="Password"></config-property-setting>
-                    <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
-                    <config-property-setting name="CreateDatabase">true</config-property-setting>
-                    <connectionmanager>
-                        <no-transaction/>
-                        <single-pool>
-                            <max-size>100</max-size>
-                            <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
-                            <select-one-assume-match/>
-                        </single-pool>
-                    </connectionmanager>
-                </connectiondefinition-instance>
-            </connection-definition>
-        </outbound-resourceadapter>
-    </resourceadapter>
-
-    <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
-        <attribute name="derbySystemHome">var/derby</attribute>
-    </gbean>
-    
-    <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
-        <reference name="derbySystem"><name>DerbySystem</name></reference>
-        <attribute name="host">localhost</attribute>
-        <attribute name="port">1527</attribute>
-    </gbean>
-    
-    <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
-        <reference name="DerbySystem"><name>DerbySystem</name></reference>
-    </gbean>
-
-    <gbean name="DerbyDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
-        <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
-    </gbean>
-
-    <gbean name="DerbyClientDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
-        <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
-    </gbean>
-    
-    <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
-        <attribute name="repeatCount">5</attribute>
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <dependency><name>DerbySystem</name></dependency>
-    </gbean>
-
-    <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
-        <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <dependency><name>DerbySystem</name></dependency>
+    <module>
+        <web>system-database-portlets.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:environment>
+                <dep:moduleId>
+                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
+                    <dep:artifactId>system-database-portlets</dep:artifactId>
+                    <dep:version>1.0-SNAPSHOT</dep:version>
+                    <dep:type>war</dep:type>
+                </dep:moduleId>
+                <dep:dependencies/>
+                <dep:hidden-classes />
+                <dep:non-overridable-classes />
+            </dep:environment>
+            <context-root>/system-database</context-root>
+            <security-realm-name>geronimo-admin</security-realm-name>
+        </web-app>
+    </module>
+
+    <module>
+        <connector>tranql-connector-derby-embed-xa-1.3.rar</connector>
+        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <resourceadapter>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>SystemDatasource</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <select-one-assume-match/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                        <connectiondefinition-instance>
+                            <name>NoTxDatasource</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">SystemDatabase</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>100</max-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <select-one-assume-match/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+
+            <gbean name="DerbySystem" class="org.apache.geronimo.derby.DerbySystemGBean">
+                <reference name="ServerInfo"><name>ServerInfo</name></reference>
+                <attribute name="derbySystemHome">var/derby</attribute>
+            </gbean>
+
+            <gbean name="DerbyNetwork" class="org.apache.geronimo.derby.DerbyNetworkGBean">
+                <reference name="derbySystem"><name>DerbySystem</name></reference>
+                <attribute name="host">localhost</attribute>
+                <attribute name="port">1527</attribute>
+            </gbean>
+
+            <gbean name="DerbyLog" class="org.apache.geronimo.derby.DerbyLogGBean">
+                <reference name="DerbySystem"><name>DerbySystem</name></reference>
+            </gbean>
+
+            <gbean name="DerbyDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
+                <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
+            </gbean>
+
+            <gbean name="DerbyClientDriver" class="org.apache.geronimo.system.util.JDBCDriverRegistrationGBean">
+                <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
+            </gbean>
+
+            <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+                <attribute name="repeatCount">5</attribute>
+                <reference name="TransactionManager"><name>TransactionManager</name></reference>
+                <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
+                <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
+                <dependency><name>DerbySystem</name></dependency>
+            </gbean>
+
+            <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+                <reference name="TransactionManager"><name>TransactionManager</name></reference>
+                <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
+                <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
+                <dependency><name>DerbySystem</name></dependency>
+            </gbean>
+        </connector>
+    </module>
+
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
+        <role-mappings>
+            <role role-name="admin">
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
+            </role>
+        </role-mappings>
+    </security>
+
+    <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Embedded DB/DB Info</attribute>
+        <attribute name="portletContext">/system-database</attribute>
+        <attribute name="portletList">[InternalDB]</attribute>
+    </gbean>
+
+    <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Embedded DB/DB Manager</attribute>
+        <attribute name="portletContext">/system-database</attribute>
+        <attribute name="portletList">[DBViewer, RunSQL]</attribute>
+    </gbean>
+
+    <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Server/Server Logs</attribute>
+        <attribute name="portletContext">/system-database</attribute>
+        <attribute name="portletList">[DerbyLogViewer]</attribute>
     </gbean>
 
-</connector>
+</application>

Copied: geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml (from r569103, geronimo/plugins/jee-management/trunk/jee-management-portlets/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml?p2=geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml&p1=geronimo/plugins/jee-management/trunk/jee-management-portlets/pom.xml&r1=569103&r2=570301&rev=570301&view=diff
==============================================================================
--- geronimo/plugins/jee-management/trunk/jee-management-portlets/pom.xml (original)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/pom.xml Mon Aug 27 21:31:11 2007
@@ -24,13 +24,13 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>jee-management</artifactId>
+        <artifactId>system-database</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>jee-management-portlets</artifactId>
-    <name>Java EE Management :: Admin Console Portlets</name>
+    <artifactId>system-database-portlets</artifactId>
+    <name>Geronimo System Database :: Admin Console Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -42,7 +42,24 @@
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-converter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-derby</artifactId>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java?rev=570301&r1=568129&r2=570301&view=diff
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java (original)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java Mon Aug 27 21:31:11 2007
@@ -74,7 +74,7 @@
             HashMap props = new HashMap();
             props.put("name","SystemDatasource");
             props.put("j2eeType","JCAManagedConnectionFactory");
-            Artifact systemDB = new Artifact("org.apache.geronimo.configs", "system-database", (Version)null, "car");
+            Artifact systemDB = new Artifact("org.apache.geronimo.plugins", "system-database-jetty", (Version)null, "car");
             AbstractNameQuery query = new AbstractNameQuery(systemDB,props);
             Iterator iter = KernelRegistry.getSingleKernel().listGBeans(query).iterator();
             

Added: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=570301&view=auto
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml (added)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml Mon Aug 27 21:31:11 2007
@@ -0,0 +1,101 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<portlet-app version="1.0">
+
+    <portlet>
+        <description>Portlet for displaying internal DB info</description>
+        <portlet-name>InternalDB</portlet-name>
+        <display-name>Internal Database Portlet</display-name>
+        <portlet-class>org.apache.geronimo.console.internaldb.InternalDBPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>DB Info</title>
+            <short-title>DB Info</short-title>
+            <keywords>DB Info</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for viewing database contents</description>
+        <portlet-name>DBViewer</portlet-name>
+        <display-name>Database Viewer Portlet</display-name>
+        <portlet-class>org.apache.geronimo.console.internaldb.DBViewerPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>DB Viewer</title>
+            <short-title>DB Viewer</short-title>
+            <keywords>DB Viewer</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for viewing the derby System database logs.</description>
+        <portlet-name>DerbyLogViewer</portlet-name>
+        <display-name>Derby Log Viewer Portlet</display-name>
+        <portlet-class>org.apache.geronimo.console.derbylogmanager.DerbyLogViewerPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Derby Log Viewer</title>
+            <short-title>Derby Log Viewer</short-title>
+            <keywords>Derby, Log, Viewer</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for running SQL commands</description>
+        <portlet-name>RunSQL</portlet-name>
+        <display-name>Run SQL Portlet</display-name>
+        <portlet-class>org.apache.geronimo.console.internaldb.RunSQLPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Run SQL</title>
+            <short-title>Run SQL</short-title>
+            <keywords>Run SQL</keywords>
+        </portlet-info>
+    </portlet>
+
+</portlet-app>

Propchange: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml?rev=570301&view=auto
==============================================================================
--- geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml Mon Aug 27 21:31:11 2007
@@ -0,0 +1,103 @@
+<?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.
+-->
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" metadata-complete="true">
+    <display-name>system-database</display-name>
+
+    <servlet>
+        <display-name>Pluto Wrapper for Internal DB Portlet</display-name>
+        <servlet-name>InternalDB</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>InternalDB</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <display-name>Pluto Wrapper for DB Viewer Portlet</display-name>
+        <servlet-name>DBViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>DBViewer</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet>
+        <display-name>Pluto Wrapper for Run SQL Portlet</display-name>
+        <servlet-name>RunSQL</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>RunSQL</param-value>
+        </init-param>
+    </servlet>
+
+   <servlet>
+        <display-name>Pluto Wrapper for Derby Log Viewer Portlet</display-name>
+        <servlet-name>DerbyLogViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>DerbyLogViewer</param-value>
+        </init-param>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>InternalDB</servlet-name>
+        <url-pattern>/PlutoInvoker/InternalDB/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>DBViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/DBViewer/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>RunSQL</servlet-name>
+        <url-pattern>/PlutoInvoker/RunSQL/*</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>DerbyLogViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/DerbyLogViewer/*</url-pattern>
+    </servlet-mapping>
+
+    <security-constraint>
+        <web-resource-collection>
+            <web-resource-name>system-database</web-resource-name>
+            <url-pattern>/</url-pattern>
+            <http-method>GET</http-method>
+            <http-method>POST</http-method>
+            <http-method>PUT</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>admin</role-name>
+        </auth-constraint>
+    </security-constraint>
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>geronimo-admin</realm-name>
+    </login-config>
+    <security-role>
+        <role-name>admin</role-name>
+    </security-role>
+
+</web-app>

Propchange: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/plugins/system-database/trunk/system-database-portlets/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml



Mime
View raw message