geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r832076 - in /geronimo/server/trunk: ./ plugins/console/console-tomcat/src/main/history/ plugins/derby/ plugins/derby/src/main/history/ plugins/openejb/openejb/src/main/history/ plugins/system-database/sysdb-console-jetty/src/main/history/ ...
Date Mon, 02 Nov 2009 19:40:13 GMT
Author: rickmcguire
Date: Mon Nov  2 19:40:13 2009
New Revision: 832076

URL: http://svn.apache.org/viewvc?rev=832076&view=rev
Log:
fix up of the system-database plugin

Modified:
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/derby/pom.xml
    geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml?rev=832076&r1=832075&r2=832076&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/history/dependencies.xml
Mon Nov  2 19:40:13 2009
@@ -42,11 +42,6 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jms_1.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.directwebremoting</groupId>
         <artifactId>dwr</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/derby/pom.xml?rev=832076&r1=832075&r2=832076&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/derby/pom.xml (original)
+++ geronimo/server/trunk/plugins/derby/pom.xml Mon Nov  2 19:40:13 2009
@@ -27,7 +27,7 @@
         <artifactId>plugins</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <groupId>org.apache.geronimo.configs</groupId>
     <artifactId>derby</artifactId>
     <name>Geronimo Plugins, Derby</name>
@@ -45,7 +45,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
@@ -57,13 +57,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>derbynet</artifactId>
+            <version>${derbyVersion}-SNAPSHOT</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.derby</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>derbytools</artifactId>
+            <version>${derbyVersion}-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml?rev=832076&r1=832075&r2=832076&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/derby/src/main/history/dependencies.xml Mon Nov  2 19:40:13
2009
@@ -26,4 +26,14 @@
         <artifactId>derbytools</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>derbynet</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>derbytools</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

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=832076&r1=832075&r2=832076&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 Nov
 2 19:40:13 2009
@@ -43,11 +43,6 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.framework</groupId>
-        <artifactId>geronimo-transformer</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.framework</groupId>
         <artifactId>server-security-config</artifactId>
         <type>car</type>
     </dependency>
@@ -117,26 +112,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.xbean</groupId>
         <artifactId>xbean-asm-shaded</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-naming</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.yoko</groupId>
         <artifactId>yoko-spec-corba</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml?rev=832076&r1=832075&r2=832076&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
Mon Nov  2 19:40:13 2009
@@ -47,6 +47,11 @@
         <type>car</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.ant</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.tranql</groupId>
         <artifactId>tranql-connector-db2-xa</artifactId>
         <type>rar</type>

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=832076&r1=832075&r2=832076&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
(original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
Mon Nov  2 19:40:13 2009
@@ -366,7 +366,7 @@
             }
         } else if (mode.equals("process-" + CONFIRM_URL_MODE)) {
             String test = actionRequest.getParameter("test");
-            if (test == null || test.equals("true")) {                              
+            if (test == null || test.equals("true")) {
                 try {
                     String targetDBInfo = attemptConnect(actionRequest, data);
                     actionResponse.setRenderParameter("targetDBInfo", targetDBInfo);
@@ -376,10 +376,10 @@
                     PrintWriter temp = new PrintWriter(writer);
                     e.printStackTrace(temp);
                     temp.flush();
-                    temp.close();                   
+                    temp.close();
                     addErrorMessage(actionRequest, getLocalizedString(actionRequest, "dbwizard.testConnection.connectionError"),
writer.getBuffer().toString());
                     actionResponse.setRenderParameter("connected", "false");
-                }                             
+                }
                 actionResponse.setRenderParameter(MODE_KEY, TEST_CONNECTION_MODE);
             } else {
                 save(actionRequest, actionResponse, data, false);
@@ -561,8 +561,8 @@
     private ResourceAdapterParams loadConfigPropertiesByPath(PortletRequest request, String
rarPath) {
         DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
         try {
-            URL url = getRAR(request, rarPath).toURL();
-            ConnectorDeployable deployable = new ConnectorDeployable(url);
+            URI uri = getRAR(request, rarPath).toURI();
+            ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request,
uri.toString()));
             final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
             String adapterName = null, adapterDesc = null;
             String[] test = ddBeanRoot.getText("connector/display-name");
@@ -983,7 +983,8 @@
             DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
             try {
                 File rarFile = getRAR(request, data.getRarPath());
-                ConnectorDeployable deployable = new ConnectorDeployable(rarFile.toURL());
+                URI uri = getRAR(request, data.getRarPath()).toURI();
+                ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request,
uri.toString()));
                 DeploymentConfiguration config = mgr.createConfiguration(deployable);
                 final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
                 Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
@@ -997,7 +998,7 @@
                 configId.setGroupId("console.dbpool");
                 configId.setVersion("1.0");
                 configId.setType("car");
-                
+
                 String artifactId = data.name;
                 // simply replace / with _ if / exists within the artifactId
                 // this is needed because we don't allow / within the artifactId
@@ -1065,9 +1066,9 @@
                 SinglePool pool = new SinglePool();
                 manager.setPoolSingle(pool);
                 pool.setMatchOne(true);
-                // Max Size needs to be set before the minimum.  This is because 
-                // the connection manager will constrain the minimum based on the 
-                // current maximum value in the pool.  We might consider adding a  
+                // Max Size needs to be set before the minimum.  This is because
+                // the connection manager will constrain the minimum based on the
+                // current maximum value in the pool.  We might consider adding a
                 // setPoolConstraints method to allow specifying both at the same time.
                 if (data.maxSize != null && !data.maxSize.equals("")) {
                     pool.setMaxSize(new Integer(data.maxSize));
@@ -1100,7 +1101,7 @@
                         throw new IllegalStateException("No target to distribute to");
                     }
                     targets = new Target[] {targets[0]};
-                    
+
                     ProgressObject po = mgr.distribute(targets, rarFile, tempFile);
                     waitForProgress(po);
                     if (po.getDeploymentStatus().isCompleted()) {
@@ -1607,7 +1608,7 @@
         public String getDeployError() {
             return deployError;
         }
-        
+
         public String getTransactionType() {
             return transactionType;
         }
@@ -1615,7 +1616,7 @@
         public void setTransactionType(String transactionType) {
             this.transactionType = transactionType;
         }
-        
+
     }
 
     public static class ConnectionPool implements Serializable, Comparable {
@@ -1706,7 +1707,7 @@
         public String getDescription() {
             return description;
         }
-        
+
         public String getRarPath() {
             return rarPath;
         }

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=832076&r1=832075&r2=832076&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Mon Nov  2 19:40:13 2009
@@ -735,9 +735,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.derby</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>derbynet</artifactId>
-                <version>${derbyVersion}</version>
+                <version>${derbyVersion}-SNAPSHOT</version>
             </dependency>
 
             <dependency>



Mime
View raw message