You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/14 08:22:03 UTC

svn commit: r356741 - in /geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console: databasemanager/wizard/DatabasePoolPortlet.java securitymanager/realm/SecurityRealmPortlet.java

Author: ammulder
Date: Tue Dec 13 23:21:55 2005
New Revision: 356741

URL: http://svn.apache.org/viewcvs?rev=356741&view=rev
Log:
Remove SNAPSHOT in the web console

Modified:
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
    geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java?rev=356741&r1=356740&r2=356741&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Tue Dec 13 23:21:55 2005
@@ -811,8 +811,8 @@
                 final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
                 Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
                 ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
-                connector.setConfigID("user/database-pool"+data.getName() + "/1/car");
-                connector.setParentID("geronimo/j2ee-server/1.0-SNAPSHOT/car");
+                connector.setConfigID("user/database-pool-"+data.getName() + "/1/car");
+                // Use a parentId of null to pick up the default
                 if(data.jar1 != null && !data.jar1.equals("")) {
                     Dependency dep = new Dependency();
                     connector.setDependency(new Dependency[]{dep});

Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java?rev=356741&r1=356740&r2=356741&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/securitymanager/realm/SecurityRealmPortlet.java Tue Dec 13 23:21:55 2005
@@ -317,7 +317,7 @@
         normalize(data);
         ConfigurationDocument doc = ConfigurationDocument.Factory.newInstance();
         ConfigurationType root = doc.addNewConfiguration();
-        root.setConfigId("SecurityRealm"+data.getName());
+        root.setConfigId("SecurityRealm-"+data.getName());
         // Use a parentId of null to pick up the default
         // Dependencies
         if(data.getJar() != null) {