Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 34304 invoked from network); 4 Aug 2009 08:50:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Aug 2009 08:50:59 -0000 Received: (qmail 74311 invoked by uid 500); 4 Aug 2009 08:51:03 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 74229 invoked by uid 500); 4 Aug 2009 08:51:03 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 74220 invoked by uid 99); 4 Aug 2009 08:51:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 08:51:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Aug 2009 08:51:00 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 416BE2388872; Tue, 4 Aug 2009 08:50:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r800701 - in /geronimo/server/trunk/plugins: activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/ Date: Tue, 04 Aug 2009 08:50:39 -0000 To: scm@geronimo.apache.org From: xuhaihong@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090804085039.416BE2388872@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xuhaihong Date: Tue Aug 4 08:50:38 2009 New Revision: 800701 URL: http://svn.apache.org/viewvc?rev=800701&view=rev Log: GERONIMO-4749 The resource adapter created via console should be deployed as car(Patch from Rex Wang) Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java geronimo/server/trunk/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java?rev=800701&r1=800700&r2=800701&view=diff ============================================================================== --- geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java (original) +++ geronimo/server/trunk/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/AbstractHandler.java Tue Aug 4 08:50:38 2009 @@ -507,7 +507,7 @@ configId.setGroupId("console.jms"); configId.setArtifactId(data.instanceName); configId.setVersion("1.0"); - configId.setType("rar"); + configId.setType("car"); if(data.dependency != null && !data.dependency.trim().equals("")) { Artifact artifact = Artifact.create(data.dependency.trim()); org.apache.geronimo.deployment.service.jsr88.Artifact dep = new org.apache.geronimo.deployment.service.jsr88.Artifact(); 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=800701&r1=800700&r2=800701&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 Tue Aug 4 08:50:38 2009 @@ -997,7 +997,7 @@ environment.setConfigId(configId); configId.setGroupId("console.dbpool"); configId.setVersion("1.0"); - configId.setType("rar"); + configId.setType("car"); String artifactId = data.name; // simply replace / with _ if / exists within the artifactId