Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 44390 invoked from network); 23 Mar 2011 09:08:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 23 Mar 2011 09:08:32 -0000 Received: (qmail 11555 invoked by uid 500); 23 Mar 2011 09:08:32 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 11517 invoked by uid 500); 23 Mar 2011 09:08:32 -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 11510 invoked by uid 99); 23 Mar 2011 09:08:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Mar 2011 09:08:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Wed, 23 Mar 2011 09:08:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F3C6C23888CE; Wed, 23 Mar 2011 09:08:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1084516 - in /geronimo/server/trunk: plugingroups/eba-jetty/ plugingroups/eba-tomcat/ plugingroups/eba-tomcat/src/main/history/ plugins/aries/ plugins/aries/aries-deployer/ plugins/aries/aries-deployer/src/main/history/ plugins/aries/aries... Date: Wed, 23 Mar 2011 09:08:04 -0000 To: scm@geronimo.apache.org From: rwonly@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110323090804.F3C6C23888CE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rwonly Date: Wed Mar 23 09:08:03 2011 New Revision: 1084516 URL: http://svn.apache.org/viewvc?rev=1084516&view=rev Log: refact geronimo aries plugin structure Removed: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationInstaller.java geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplication.java geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContext.java geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContextManager.java geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoLocalPlatform.java geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationConfigBuilder.java Modified: geronimo/server/trunk/plugingroups/eba-jetty/pom.xml geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java geronimo/server/trunk/plugins/aries/pom.xml Modified: geronimo/server/trunk/plugingroups/eba-jetty/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-jetty/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugingroups/eba-jetty/pom.xml (original) +++ geronimo/server/trunk/plugingroups/eba-jetty/pom.xml Wed Mar 23 09:08:03 2011 @@ -46,6 +46,12 @@ org.apache.geronimo.configs + aries + ${project.version} + car + + + org.apache.geronimo.configs aries-deployer ${project.version} car Modified: geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml (original) +++ geronimo/server/trunk/plugingroups/eba-tomcat/pom.xml Wed Mar 23 09:08:03 2011 @@ -46,6 +46,12 @@ org.apache.geronimo.configs + aries + ${project.version} + car + + + org.apache.geronimo.configs aries-deployer ${project.version} car Modified: geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugingroups/eba-tomcat/src/main/history/dependencies.xml Wed Mar 23 09:08:03 2011 @@ -8,6 +8,11 @@ org.apache.geronimo.configs + aries + car + + + org.apache.geronimo.configs aries-deployer car Modified: geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original) +++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Wed Mar 23 09:08:03 2011 @@ -40,7 +40,13 @@ geronimo-aries-builder ${project.version} - + + + org.apache.geronimo.configs + aries + ${project.version} + car + - org.apache.aries.application - org.apache.aries.application.resolver.obr - - - org.apache.aries.blueprint org.apache.aries.blueprint + + + org.apache.aries.application + org.apache.aries.application.resolver.obr + org.apache.aries.application Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml (original) +++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/history/dependencies.xml Wed Mar 23 09:08:03 2011 @@ -28,30 +28,10 @@ org.apache.aries.application - org.apache.aries.application.api - jar - - - org.apache.aries.application - org.apache.aries.application.management - jar - - - org.apache.aries.application - org.apache.aries.application.resolver.obr - jar - - - org.apache.aries.application org.apache.aries.application.utils jar - org.apache.aries.blueprint - org.apache.aries.blueprint - jar - - org.apache.felix org.apache.felix.bundlerepository jar @@ -97,6 +77,11 @@ jar + org.apache.geronimo.configs + aries + car + + org.apache.geronimo.framework geronimo-cli jar Modified: geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml (original) +++ geronimo/server/trunk/plugins/aries/aries-deployer/src/main/plan/plan.xml Wed Mar 23 09:08:03 2011 @@ -24,21 +24,4 @@ - - - - - - - - org.apache.geronimo.modules - geronimo-aries-builder - ${version} - jar - - - - - - Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/pom.xml Wed Mar 23 09:08:03 2011 @@ -35,14 +35,22 @@ + ${pom.groupId} + geronimo-aries + ${project.version} + + + org.apache.geronimo.modules geronimo-security-builder ${project.version} + org.apache.aries.application org.apache.aries.application.utils + @@ -55,9 +63,6 @@ org.apache.geronimo.aries.builder - - * - Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java Wed Mar 23 09:08:03 2011 @@ -51,7 +51,7 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import org.apache.geronimo.aries.ApplicationInstaller; /** * @version $Rev:385232 $ $Date$ */ Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationGBean.java Wed Mar 23 09:08:03 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.geronimo.aries.builder; +package org.apache.geronimo.aries; import java.io.File; import java.io.FileInputStream; Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ApplicationInstaller.java Wed Mar 23 09:08:03 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.geronimo.aries.builder; +package org.apache.geronimo.aries; import java.io.File; import java.io.IOException; Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplication.java Wed Mar 23 09:08:03 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.geronimo.aries.builder; +package org.apache.geronimo.aries; import java.io.File; import java.io.FileNotFoundException; Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContext.java Wed Mar 23 09:08:03 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.geronimo.aries.builder; +package org.apache.geronimo.aries; import java.util.Set; Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoApplicationContextManager.java Wed Mar 23 09:08:03 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.geronimo.aries.builder; +package org.apache.geronimo.aries; import java.util.HashSet; import java.util.Set; Modified: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java (original) +++ geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/GeronimoLocalPlatform.java Wed Mar 23 09:08:03 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.geronimo.aries.builder; +package org.apache.geronimo.aries; import java.io.File; import java.io.IOException; Modified: geronimo/server/trunk/plugins/aries/pom.xml URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/pom.xml?rev=1084516&r1=1084515&r2=1084516&view=diff ============================================================================== --- geronimo/server/trunk/plugins/aries/pom.xml (original) +++ geronimo/server/trunk/plugins/aries/pom.xml Wed Mar 23 09:08:03 2011 @@ -37,6 +37,8 @@ + geronimo-aries + aries geronimo-aries-builder aries-deployer