geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r922415 - in /geronimo/server/trunk: ./ framework/configs/karaf-framework/ framework/configs/karaf-framework/src/main/filtered-resources/etc/ framework/configs/karaf-framework/src/main/history/ framework/configs/rmi-naming/src/main/history/...
Date Fri, 12 Mar 2010 20:32:24 GMT
Author: gawor
Date: Fri Mar 12 20:32:23 2010
New Revision: 922415

URL: http://svn.apache.org/viewvc?rev=922415&view=rev
Log:
synch with latest aries code

Removed:
    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/java/org/apache/geronimo/aries/builder/NoOpResolver.java
Modified:
    geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
    geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml
    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/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/resources/OSGI-INF/blueprint/app-context-management.xml
    geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java
    geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/configs/karaf-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/pom.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/pom.xml Fri Mar 12 20:32:23 2010
@@ -436,14 +436,6 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
         </dependency>
-      <dependency>
-          <groupId>org.apache.aries.blueprint</groupId>
-          <artifactId>org.apache.aries.blueprint.core</artifactId>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.aries.blueprint</groupId>
-          <artifactId>org.apache.aries.blueprint.cm</artifactId>
-      </dependency>
         <dependency>
             <groupId>org.apache.aries.jmx</groupId>
             <artifactId>org.apache.aries.jmx</artifactId>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/startup.properties
Fri Mar 12 20:32:23 2010
@@ -36,9 +36,7 @@ org/apache/felix/org.apache.felix.filein
 # The rest of the services..
 #
 org/apache/aries/org.apache.aries.util/${aries.blueprint.version}/org.apache.aries.util-${aries.blueprint.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.api/${aries.blueprint.version}/org.apache.aries.blueprint.api-${aries.blueprint.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.core/${aries.blueprint.version}/org.apache.aries.blueprint.core-${aries.blueprint.version}.jar=20
-org/apache/aries/blueprint/org.apache.aries.blueprint.cm/${aries.blueprint.version}/org.apache.aries.blueprint.cm-${aries.blueprint.version}.jar=20
+org/apache/aries/blueprint/org.apache.aries.blueprint/${aries.blueprint.version}/org.apache.aries.blueprint-${aries.blueprint.version}.jar=20
 
 org/apache/felix/gogo/org.apache.felix.gogo.runtime/${felix.gogo.version}/org.apache.felix.gogo.runtime-${felix.gogo.version}.jar=30
 org/apache/felix/karaf/shell/org.apache.felix.karaf.shell.console/${felix.karaf.version}/org.apache.felix.karaf.shell.console-${felix.karaf.version}.jar=30

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Fri Mar 12 20:32:23 2010
@@ -27,21 +27,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.cm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.core</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.aries.jmx</groupId>
         <artifactId>org.apache.aries.jmx</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/history/dependencies.xml Fri
Mar 12 20:32:23 2010
@@ -7,6 +7,11 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>org.apache.aries</groupId>
+        <artifactId>org.apache.aries.util</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.aries.jndi</groupId>
         <artifactId>org.apache.aries.jndi.core</artifactId>
         <type>jar</type>

Modified: geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-blueprint/pom.xml Fri Mar 12 20:32:23
2010
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker-blueprint/src/main/history/dependencies.xml
Fri Mar 12 20:32:23 2010
@@ -33,17 +33,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.api</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.cm</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.aries.blueprint</groupId>
-        <artifactId>org.apache.aries.blueprint.core</artifactId>
+        <artifactId>org.apache.aries.blueprint</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq-blueprint/pom.xml Fri Mar 12
20:32:23 2010
@@ -104,15 +104,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.aries.blueprint</groupId>
-            <artifactId>org.apache.aries.blueprint.cm</artifactId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
         </dependency>
 
         <dependency>

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=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/aries/aries-deployer/pom.xml Fri Mar 12 20:32:23 2010
@@ -55,6 +55,11 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.aries.blueprint</groupId>
+            <artifactId>org.apache.aries.blueprint</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.aries.application</groupId>
             <artifactId>org.apache.aries.application.api</artifactId>
         </dependency>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationGBean.java
Fri Mar 12 20:32:23 2010
@@ -25,12 +25,12 @@ import org.apache.aries.application.Appl
 import org.apache.aries.application.DeploymentContent;
 import org.apache.aries.application.DeploymentMetadata;
 import org.apache.aries.application.DeploymentMetadataFactory;
-import org.apache.aries.application.management.ApplicationContextManager;
 import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.aries.application.management.AriesApplicationResolver;
 import org.apache.aries.application.management.BundleInfo;
 import org.apache.aries.application.management.ManagementException;
-import org.apache.aries.application.management.ApplicationContext.ApplicationState;
+import org.apache.aries.application.management.AriesApplicationContext.ApplicationState;
 import org.apache.geronimo.gbean.GBeanLifecycle;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -95,11 +95,11 @@ public class ApplicationGBean implements
         return applicationState;
     }
         
-    private ApplicationContextManager getApplicationContextManager() {
+    private AriesApplicationContextManager getApplicationContextManager() {
         ServiceReference ref = 
-            bundleContext.getServiceReference(ApplicationContextManager.class.getName());
+            bundleContext.getServiceReference(AriesApplicationContextManager.class.getName());
         if (ref != null) {
-            return (ApplicationContextManager) bundleContext.getService(ref);
+            return (AriesApplicationContextManager) bundleContext.getService(ref);
         } else {
             return null;
         }

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContext.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContext.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContext.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContext.java
Fri Mar 12 20:32:23 2010
@@ -21,12 +21,12 @@ package org.apache.geronimo.aries.builde
 
 import java.util.Set;
 
-import org.apache.aries.application.management.ApplicationContext;
 import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContext;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 
-public class GeronimoApplicationContext implements ApplicationContext {
+public class GeronimoApplicationContext implements AriesApplicationContext {
 
     private ApplicationGBean applicationGBean;
     

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContextManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContextManager.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContextManager.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/GeronimoApplicationContextManager.java
Fri Mar 12 20:32:23 2010
@@ -25,15 +25,15 @@ import java.util.concurrent.ConcurrentHa
 import java.util.concurrent.ConcurrentMap;
 
 import org.apache.aries.application.ApplicationMetadata;
-import org.apache.aries.application.management.ApplicationContext;
-import org.apache.aries.application.management.ApplicationContextManager;
 import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.aries.application.management.ManagementException;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.ServiceReference;
 
-public class GeronimoApplicationContextManager implements ApplicationContextManager {
+public class GeronimoApplicationContextManager implements AriesApplicationContextManager
{
 
     private ConcurrentMap<String, GeronimoApplicationContext> contextMap;
     private BundleContext bundleContext;
@@ -57,7 +57,7 @@ public class GeronimoApplicationContextM
         return metadata.getApplicationScope();
     }
 
-    public ApplicationContext getApplicationContext(AriesApplication app) throws BundleException,
ManagementException {
+    public AriesApplicationContext getApplicationContext(AriesApplication app) throws BundleException,
ManagementException {
         String key = getApplicationKey(app);
         GeronimoApplicationContext applicationContext = contextMap.get(key);
         if (applicationContext == null) {
@@ -77,13 +77,13 @@ public class GeronimoApplicationContextM
         return applicationContext;
     }
 
-    public Set<ApplicationContext> getApplicationContexts() {
-        Set<ApplicationContext> result = new HashSet<ApplicationContext>();
+    public Set<AriesApplicationContext> getApplicationContexts() {
+        Set<AriesApplicationContext> result = new HashSet<AriesApplicationContext>();
         result.addAll(contextMap.values());
         return result;
     }
 
-    public void remove(ApplicationContext app) {     
+    public void remove(AriesApplicationContext app) {     
         String key = getApplicationKey(app.getApplication());
         GeronimoApplicationContext applicationContext = contextMap.remove(key);
         if (applicationContext != null) {

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/resources/OSGI-INF/blueprint/app-context-management.xml
Fri Mar 12 20:32:23 2010
@@ -22,18 +22,16 @@
   <bean id="app-context-manager" class="org.apache.geronimo.aries.builder.GeronimoApplicationContextManager"
scope="singleton" activation="lazy" init-method="init" destroy-method="destroy">
     <property name="bundleContext" ref="blueprintBundleContext"/>
   </bean>
-  <service interface="org.apache.aries.application.management.ApplicationContextManager"
ref="app-context-manager" />
+  <service interface="org.apache.aries.application.management.AriesApplicationContextManager"
ref="app-context-manager" />
   
-  <bean id="default-local-platform" class="org.apache.geronimo.aries.builder.GeronimoLocalPlatform"/>
+  
+  <bean id="default-local-platform" class="org.apache.aries.application.utils.management.DefaultLocalPlatform"/>
   <service interface="org.apache.aries.application.management.LocalPlatform" 
            ref="default-local-platform" />
   
-
-  <bean id="no-op-resolver" class="org.apache.geronimo.aries.builder.NoOpResolver"/>
+  <bean id="no-op-resolver" class="org.apache.aries.application.utils.management.NoOpResolver"/>
   <service interface="org.apache.aries.application.management.AriesApplicationResolver"

             ref="no-op-resolver"
             ranking="-1"/>
-
-  
-
+ 
 </blueprint>

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java
Fri Mar 12 20:32:23 2010
@@ -21,8 +21,8 @@ package org.apache.geronimo.aries.shell;
 
 import java.util.Set;
 
-import org.apache.aries.application.management.ApplicationContext;
-import org.apache.aries.application.management.ApplicationContextManager;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.aries.application.management.AriesApplicationManager;
 import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
 import org.osgi.framework.ServiceReference;
@@ -32,10 +32,10 @@ import org.osgi.framework.ServiceReferen
  */
 public abstract class ApplicationCommandSupport extends OsgiCommandSupport {
 
-    protected ApplicationContextManager getApplicationContextManager() {
+    protected AriesApplicationContextManager getApplicationContextManager() {
         ServiceReference ref = 
-            bundleContext.getServiceReference(ApplicationContextManager.class.getName());
-        return getService(ApplicationContextManager.class, ref);
+            bundleContext.getServiceReference(AriesApplicationContextManager.class.getName());
+        return getService(AriesApplicationContextManager.class, ref);
     }
     
     protected AriesApplicationManager getAriesApplicationManager() {
@@ -44,9 +44,9 @@ public abstract class ApplicationCommand
         return getService(AriesApplicationManager.class, ref);
     }
     
-    protected ApplicationContext findApplicationContext(ApplicationContextManager manager,
String appName) {
-        Set<ApplicationContext> contexts = manager.getApplicationContexts();
-        for (ApplicationContext context : contexts) {
+    protected AriesApplicationContext findApplicationContext(AriesApplicationContextManager
manager, String appName) {
+        Set<AriesApplicationContext> contexts = manager.getApplicationContexts();
+        for (AriesApplicationContext context : contexts) {
             String name = context.getApplication().getApplicationMetadata().getApplicationScope();
             if (appName.equals(name)) {
                 return context;

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java
Fri Mar 12 20:32:23 2010
@@ -21,8 +21,8 @@ package org.apache.geronimo.aries.shell;
 
 import java.io.File;
 
-import org.apache.aries.application.management.ApplicationContext;
 import org.apache.aries.application.management.AriesApplication;
+import org.apache.aries.application.management.AriesApplicationContext;
 import org.apache.aries.application.management.AriesApplicationManager;
 import org.apache.aries.application.utils.filesystem.FileSystem;
 import org.apache.felix.gogo.commands.Argument;
@@ -41,7 +41,7 @@ public class InstallApplication extends 
     protected Object doExecute() throws Exception {
         AriesApplicationManager manager = getAriesApplicationManager();
         AriesApplication application = manager.createApplication(FileSystem.getFSRoot(new
File(applicationPath)));        
-        ApplicationContext context = manager.install(application);
+        AriesApplicationContext context = manager.install(application);
         System.out.println("Installed EBA: " + context.getApplication().getApplicationMetadata().getApplicationScope());
         return null;
     }

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java
Fri Mar 12 20:32:23 2010
@@ -21,8 +21,8 @@ package org.apache.geronimo.aries.shell;
 
 import java.util.Set;
 
-import org.apache.aries.application.management.ApplicationContext;
-import org.apache.aries.application.management.ApplicationContextManager;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
@@ -37,15 +37,15 @@ public class ListApplication extends App
     
     @Override
     protected Object doExecute() throws Exception {
-        ApplicationContextManager contextManager = getApplicationContextManager();
+        AriesApplicationContextManager contextManager = getApplicationContextManager();
         if (applicationName == null) {
             System.out.println("EBA Applications:");
-            Set<ApplicationContext> contexts = contextManager.getApplicationContexts();
-            for (ApplicationContext context : contexts) {
+            Set<AriesApplicationContext> contexts = contextManager.getApplicationContexts();
+            for (AriesApplicationContext context : contexts) {
                 System.out.println(context.getApplication().getApplicationMetadata().getApplicationScope()
+ "\t" + context.getApplicationState());
             }
         } else {
-            ApplicationContext context = findApplicationContext(contextManager, applicationName);
+            AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
             if (context == null) {
                 System.out.println("EBA " + applicationName + " not found");
             } else {

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java
Fri Mar 12 20:32:23 2010
@@ -19,8 +19,8 @@
 
 package org.apache.geronimo.aries.shell;
 
-import org.apache.aries.application.management.ApplicationContext;
-import org.apache.aries.application.management.ApplicationContextManager;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
@@ -35,8 +35,8 @@ public class StartApplication extends Ap
     
     @Override
     protected Object doExecute() throws Exception {
-        ApplicationContextManager contextManager = getApplicationContextManager();
-        ApplicationContext context = findApplicationContext(contextManager, applicationName);
+        AriesApplicationContextManager contextManager = getApplicationContextManager();
+        AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
         if (context == null) {
             System.out.println("EBA " + applicationName + " not found");
         } else {

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java
Fri Mar 12 20:32:23 2010
@@ -19,8 +19,8 @@
 
 package org.apache.geronimo.aries.shell;
 
-import org.apache.aries.application.management.ApplicationContext;
-import org.apache.aries.application.management.ApplicationContextManager;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 
@@ -35,8 +35,8 @@ public class StopApplication extends App
     
     @Override
     protected Object doExecute() throws Exception {
-        ApplicationContextManager contextManager = getApplicationContextManager();
-        ApplicationContext context = findApplicationContext(contextManager, applicationName);
+        AriesApplicationContextManager contextManager = getApplicationContextManager();
+        AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
         if (context == null) {
             System.out.println("EBA " + applicationName + " not found");
         } else {

Modified: geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java
(original)
+++ geronimo/server/trunk/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java
Fri Mar 12 20:32:23 2010
@@ -19,8 +19,8 @@
 
 package org.apache.geronimo.aries.shell;
 
-import org.apache.aries.application.management.ApplicationContext;
-import org.apache.aries.application.management.ApplicationContextManager;
+import org.apache.aries.application.management.AriesApplicationContext;
+import org.apache.aries.application.management.AriesApplicationContextManager;
 import org.apache.aries.application.management.AriesApplicationManager;
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
@@ -36,8 +36,8 @@ public class UninstallApplication extend
 
     @Override
     protected Object doExecute() throws Exception {
-        ApplicationContextManager contextManager = getApplicationContextManager();
-        ApplicationContext context = findApplicationContext(contextManager, applicationName);
+        AriesApplicationContextManager contextManager = getApplicationContextManager();
+        AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
         if (context == null) {
             System.out.println("EBA " + applicationName + " not found");
         } else {

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=922415&r1=922414&r2=922415&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Mar 12 20:32:23 2010
@@ -1944,6 +1944,12 @@ only found in cxf
 
             <dependency>
                 <groupId>org.apache.aries.blueprint</groupId>
+                <artifactId>org.apache.aries.blueprint</artifactId>
+                <version>0.1-incubating-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.aries.blueprint</groupId>
                 <artifactId>org.apache.aries.blueprint.api</artifactId>
                 <version>0.1-incubating-SNAPSHOT</version>
                 <exclusions>



Mime
View raw message