geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r949464 - in /geronimo/devtools/eclipse-plugin/trunk: assembly/ assembly/src/main/assembly/ eclipse/ features/org.apache.geronimo.v30.feature/ plugins/org.apache.geronimo.st.v11.ui/META-INF/ plugins/org.apache.geronimo.st.v21.core/META-INF/...
Date Sun, 30 May 2010 03:22:09 GMT
Author: mcconne
Date: Sun May 30 03:22:07 2010
New Revision: 949464

URL: http://svn.apache.org/viewvc?rev=949464&view=rev
Log:
GERONIMODEVTOOLS-614 Remove runtime and build-time dependencies on the free Aries tooling

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
  (with props)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
  (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
    geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
    geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/pom.xml Sun May 30 03:22:07 2010
@@ -77,6 +77,12 @@
            
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
+            <version>${version}</version>
+        </dependency>
+           
+        <dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>
@@ -190,6 +196,12 @@
         </dependency>
            
         <dependency>
+             <groupId>org.apache.geronimo.devtools</groupId>
+             <artifactId>org.apache.geronimo.st.v30.jaxbmodel</artifactId>
+             <version>${version}</version>
+         </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v30.ui</artifactId>
             <version>${version}</version>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/deployable.xml Sun May
30 03:22:07 2010
@@ -56,6 +56,7 @@
             <unpack>false</unpack>
             <includes>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jaxbmodel.common</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
@@ -76,6 +77,7 @@
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.ui</include>
              </includes>
         </dependencySet>

Modified: geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/assembly/src/main/assembly/updatesite.xml Sun May
30 03:22:07 2010
@@ -59,7 +59,8 @@
             <outputDirectory>plugins/</outputDirectory>
             <unpack>false</unpack>
             <includes>
-            <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.j2ee.v11.jaxbmodel</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.jaxbmodel.common</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.jee.v21.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.common</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.runtime.v11</include>
@@ -80,6 +81,7 @@
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.core</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v22.ui</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.core</include>
+                <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.jaxbmodel</include>
                 <include>org.apache.geronimo.devtools:org.apache.geronimo.st.v30.ui</include>
              </includes>
         </dependencySet>

Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Sun May 30 03:22:07 2010
@@ -31,19 +31,19 @@
     </condition>
 
     <target name="init">
-        <property name="helios_url"                     value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/M7"/>
-        <property name="helios_jee_win32"               value="eclipse-jee-helios-M7-win32.zip"/>
-        <property name="helios_jee_win64"               value="eclipse-jee-helios-M7-win32_64.zip"/>
-        <property name="helios_jee_linux"               value="eclipse-jee-helios-M7-linux-gtk.tar"/>
-        <property name="helios_jee_linux-x86_64"        value="eclipse-jee-helios-M7-linux-gtk-x86_64.tar"/>
-        <property name="helios_jee_macos"               value="eclipse-jee-helios-M7-macosx-carbon.tar"/>
+        <property name="helios_url"                     value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/RC1"/>
+        <property name="helios_jee_win32"               value="eclipse-jee-helios-RC1-win32.zip"/>
+        <property name="helios_jee_win64"               value="eclipse-jee-helios-RC1-win32_64.zip"/>
+        <property name="helios_jee_linux"               value="eclipse-jee-helios-RC1-linux-gtk.tar"/>
+        <property name="helios_jee_linux-x86_64"        value="eclipse-jee-helios-RC1-linux-gtk-x86_64.tar"/>
+        <property name="helios_jee_macos"               value="eclipse-jee-helios-RC1-macosx-carbon.tar"/>
         <property name="helios_jee_linux_gz"            value="${helios_jee_linux}.gz"/>
         <property name="helios_jee_linux-x86_64_gz"     value="${helios_jee_linux-x86_64}.gz"/>
         <property name="helios_jee_macos_gz"            value="${helios_jee_macos}.gz"/>
-        
-        <property name="tptp-version"                   value="4.7.0M7"/>
+
+        <property name="tptp-version"                   value="4.7.0RC2"/>
         <property name="tptp"                           value="tptp.runtime-TPTP-${tptp-version}.zip"/>
-        <property name="tptp-runtime-url"               value="http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0M7-201005041505"/>
+        <property name="tptp-runtime-url"               value="http://www.eclipse.org/downloads/download.php?file=/tptp/4.7.0/TPTP-4.7.0RC2-201005251601"/>
 
         <property name="protocol"                       value="&amp;r=1&amp;protocol=http"/>
     </target>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.v30.feature/feature.xml
Sun May 30 03:22:07 2010
@@ -114,6 +114,13 @@
          unpack="false"/>
          
     <plugin
+         id="org.apache.geronimo.st.v30.jaxbmodel"
+         download-size="20"
+         install-size="20"
+         version="3.0.0"
+         unpack="false"/>
+         
+    <plugin
          id="org.apache.geronimo.st.v30.ui"
          download-size="16"
          install-size="16"

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
Sun May 30 03:22:07 2010
@@ -6,7 +6,7 @@ Bundle-Version: 3.0.0
 Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
 Bundle-Vendor: Apache.org
 Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.runtime.v11;bundle-version="3.0.0",
+Require-Bundle: org.apache.geronimo.runtime.v11,
  org.apache.geronimo.st.ui,
  org.apache.geronimo.j2ee.v11.jaxbmodel,
  org.apache.geronimo.st.v11.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
Sun May 30 03:22:07 2010
@@ -8,7 +8,7 @@ Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.st.core,
  org.apache.geronimo.jee.v21.jaxbmodel,
- org.apache.geronimo.runtime.v21;bundle-version="3.0.0",
+ org.apache.geronimo.runtime.v21,
  org.eclipse.jst.j2ee,
  org.eclipse.core.runtime,
  org.eclipse.wst.server.core,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
Sun May 30 03:22:07 2010
@@ -7,7 +7,6 @@ Bundle-Activator: org.apache.geronimo.st
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: 
- com.ibm.etools.aries.core;resolution:=optional,
  org.apache.geronimo.jee.v21.jaxbmodel,
  org.apache.geronimo.st.v30.jaxbmodel,
  org.apache.geronimo.runtime.v30,
@@ -39,3 +38,5 @@ Export-Package: 
  org.apache.geronimo.st.v30.core.internal,
  org.apache.geronimo.st.v30.core.jaxb,
  org.apache.geronimo.st.v30.core.operations
+Import-Package: 
+ com.ibm.etools.aries.internal.core.datatransfer.exportmodel

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/plugin.xml
Sun May 30 03:22:07 2010
@@ -430,6 +430,25 @@
      <extension-point id="JAXBUtilsProvider" name="Geronimo JAXB Utils" schema="schema/JAXBUtilsProvider.exsd"/>
      <extension point="org.apache.geronimo.st.v30.core.JAXBUtilsProvider">
          <provider class="org.apache.geronimo.st.v30.core.jaxb.JAXBUtilsProvider" version="3.0"/>
-     </extension>   
+     </extension>
+
+
+
+     <!-- 
+      ###################################################################################################################
+      ##                                                                                
                              ##
+      ## DataModel Provider(s) - Specify the Aries datamodel providers for an OSGi application,
composite bunder, and  ##
+      ##                         bundle                                                 
                              ##
+      ##                                                                                
                              ##
+      ###################################################################################################################
+      -->
+     <extension point="org.eclipse.wst.common.frameworks.DataModelProviderExtension">
+        <DataModelProvider id="osgi.application.datamodelprovider"
+            class="com.ibm.etools.aries.internal.core.datatransfer.exportmodel.ApplicationExportDataModelProvider"/>
+        <DataModelProvider id="osgi.composite.datamodelprovider"
+            class="com.ibm.etools.aries.internal.core.datatransfer.exportmodel.ApplicationExportDataModelProvider"/>
+        <DataModelProvider id="osgi.bundle.datamodelprovider"
+            class="com.ibm.etools.aries.internal.core.datatransfer.exportmodel.BundleExportDataModelProvider"/>
+     </extension>
     
 </plugin>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
Sun May 30 03:22:07 2010
@@ -1,4 +1,4 @@
-/*
+/* 
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -16,11 +16,6 @@
  */
 package org.apache.geronimo.st.v30.core;
 
-import com.ibm.etools.aries.internal.core.IAriesModuleConstants;
-import com.ibm.etools.aries.internal.core.datatransfer.exportmodel.ApplicationExportDataModelProvider;
-import com.ibm.etools.aries.internal.core.datatransfer.exportmodel.BundleExportDataModelProvider;
-
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +27,8 @@ import javax.enterprise.deploy.spi.excep
 import org.apache.geronimo.st.v30.core.commands.DeploymentCommandFactory;
 import org.apache.geronimo.st.v30.core.commands.TargetModuleIdNotFoundException;
 import org.apache.geronimo.st.v30.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.osgi.AriesHelper;
+import org.apache.geronimo.st.v30.core.osgi.OsgiConstants;
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
@@ -142,16 +139,16 @@ public class DeploymentUtils {
             return ".car";
         }
         else if (GeronimoUtils.isEBAModule(module)) {
-            Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".eba");
-            return ".eba";
+            Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", OsgiConstants.APPLICATION_EXTENSION);
+            return OsgiConstants.APPLICATION_EXTENSION;
         }
         else if (GeronimoUtils.isCBAModule(module)) {
-            Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".cba");
-            return ".cba";
+            Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", OsgiConstants.COMPOSITE_BUNDLE_EXTENSION);
+            return OsgiConstants.COMPOSITE_BUNDLE_EXTENSION;
         }
         else if (GeronimoUtils.isBundleModule(module)) {
-            Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".jar");
-            return ".jar";
+            Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", OsgiConstants.BUNDLE_EXTENSION);
+            return OsgiConstants.BUNDLE_EXTENSION;
         }
 
         Trace.tracePoint("Exit ", "DeploymentUtils.getModuleExtension", ".jar");
@@ -210,12 +207,18 @@ public class DeploymentUtils {
             return DataModelFactory.createDataModel(new ConnectorComponentExportDataModelProvider());
         } else if (IModuleConstants.JST_APPCLIENT_MODULE.equals(type)) {
             return DataModelFactory.createDataModel(new AppClientComponentExportDataModelProvider());
-        } else if (IAriesModuleConstants.OSGI_APP.equals(type)) {
-            return DataModelFactory.createDataModel(new ApplicationExportDataModelProvider());
-        } else if (IAriesModuleConstants.OSGI_COMP_BUNDLE.equals(type)) {   
-            return DataModelFactory.createDataModel(new ApplicationExportDataModelProvider());
-        } else if (IAriesModuleConstants.OSGI_COMP_BUNDLE.equals(type)) {
-            return DataModelFactory.createDataModel(new BundleExportDataModelProvider());
+        }
+
+        if (AriesHelper.isAriesInstalled()) {
+            if (OsgiConstants.APPLICATION.equals(type)) {
+                return DataModelFactory.createDataModel(OsgiConstants.APPLICATION_DATAMODEL_PROVIDER_ID);
+            }
+            else if (OsgiConstants.COMPOSITE_BUNDLE.equals(type)) {
+                return DataModelFactory.createDataModel(OsgiConstants.COMPOSITE_BUNDLE_DATAMODEL_PROVIDER_ID);
+            }
+            else if (OsgiConstants.BUNDLE.equals(type)) {
+                return DataModelFactory.createDataModel(OsgiConstants.BUNDLE_DATAMODEL_PROVIDER_ID);
+            }
         }
 
         Trace.tracePoint("Exit ", "DeploymentUtils.getExportDataModel", null);

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
Sun May 30 03:22:07 2010
@@ -16,10 +16,6 @@
  */
 package org.apache.geronimo.st.v30.core;
 
-import com.ibm.etools.aries.internal.core.IAriesModuleConstants;
-import com.ibm.etools.aries.internal.core.modules.IApplication;
-import com.ibm.etools.aries.internal.core.modules.IBundle;
-
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -31,6 +27,8 @@ import java.util.jar.JarFile;
 import java.util.jar.Manifest;
 
 import org.apache.geronimo.st.v30.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.osgi.AriesHelper;
+import org.apache.geronimo.st.v30.core.osgi.OsgiConstants;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -47,6 +45,8 @@ import org.eclipse.wst.server.core.Serve
 import org.eclipse.wst.server.core.ServerUtil;
 import org.eclipse.wst.server.core.internal.ServerMonitorManager;
 import org.eclipse.wst.server.core.model.ServerDelegate;
+import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable;
+
 
 /**
  * <b>GeronimoServerDelegate</b> contains the properties for the Geronimo server
that are persisted across
@@ -152,10 +152,10 @@ abstract public class GeronimoServerDele
         IStatus status = canModifyModules(new IModule[] { module }, null);
         if (status != null && !status.isOK())
             throw new CoreException(status);
-        IModule[] childs = doGetParentModules(module);
-        if (childs.length > 0) {
-            Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", childs);
-            return childs;
+        IModule[] modules = doGetParentModules(module);
+        if (modules.length > 0) {
+            Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", modules);
+            return modules;
         }
 
         Trace.tracePoint("Exit ", "GeronimoServerDelegate.getRootModules", new IModule[]
{ module });
@@ -199,20 +199,27 @@ abstract public class GeronimoServerDele
                         }
                     }
                 }
-                else if (IAriesModuleConstants.OSGI_APP.equals(moduleType.getId())) {
-                    IApplication osgiApplication = (IApplication) module[0].loadAdapter(IApplication.class,
null);  
-                    IModule[] modules = osgiApplication.getModules();
-                    if (modules != null) {
-                        Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules",
modules);
-                        return modules;
+
+                if (AriesHelper.isAriesInstalled()) {
+                    if (OsgiConstants.APPLICATION.equals(moduleType.getId())) {
+                        FlatComponentDeployable application = (FlatComponentDeployable) module[0].loadAdapter(FlatComponentDeployable.class,
 null);
+                        if (application != null) {
+                            IModule[] modules = application.getModules();
+                            if (modules != null) {
+                                Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules",
modules);
+                                return modules;
+                            }
+                        }
                     }
-                }
-                else if (IAriesModuleConstants.OSGI_COMP_BUNDLE.equals(moduleType.getId()))
{
-                    IApplication osgiApplication = (IApplication) module[0].loadAdapter(IApplication.class,
null);  
-                    IModule[] modules = osgiApplication.getModules();
-                    if (modules != null) {
-                        Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules",
modules);
-                        return modules;
+                    else if (OsgiConstants.COMPOSITE_BUNDLE.equals(moduleType.getId())) {
+                        FlatComponentDeployable composite = (FlatComponentDeployable) module[0].loadAdapter(FlatComponentDeployable.class,
 null);
+                        if (composite != null) {
+                            IModule[] modules = composite.getModules();
+                            if (modules != null) {
+                                Trace.tracePoint("Exit ", "GeronimoServerDelegate.getChildModules",
modules);
+                                return modules;
+                            }
+                        }
                     }
                 }
             }
@@ -543,30 +550,32 @@ abstract public class GeronimoServerDele
         IModule[] ears = ServerUtil.getModules(IModuleConstants.JST_EAR_MODULE);
         for (int i = 0; i < ears.length; i++) {
             IEnterpriseApplication ear = (IEnterpriseApplication) ears[i].loadAdapter(IEnterpriseApplication.class,
null);
-            IModule[] childs = ear.getModules();
-            for (int j = 0; j < childs.length; j++) {
-                if (childs[j].equals(module))
+            IModule[] modules = ear.getModules();
+            for (int j = 0; j < modules.length; j++) {
+                if (modules[j].equals(module))
                     list.add(ears[i]);
             }
         }
 
-        IModule[] applicationBundles = ServerUtil.getModules(IAriesModuleConstants.OSGI_APP);
-        for (int i = 0; i < applicationBundles.length; i++) {
-            IApplication application = (IApplication) applicationBundles[i].loadAdapter(IApplication.class,
null);
-            IModule[] childs = application.getModules();
-            for (int j = 0; j < childs.length; j++) {
-                if (childs[j].equals(module))
-                    list.add(applicationBundles[i]);
+        if (AriesHelper.isAriesInstalled()) {
+            IModule[] applications = ServerUtil.getModules(OsgiConstants.APPLICATION);
+            for (int i = 0; i < applications.length; i++) {
+                FlatComponentDeployable application = (FlatComponentDeployable) applications[i].loadAdapter(FlatComponentDeployable.class,
 null);
+                IModule[] modules = application.getModules();
+                for (int j = 0; j < modules.length; j++) {
+                    if (modules[j].equals(module))
+                        list.add(applications[i]);
+                }
             }
-        }
-
-        IModule[] compositeBundles = ServerUtil.getModules(IAriesModuleConstants.OSGI_COMP_BUNDLE);
-        for (int i = 0; i < compositeBundles.length; i++) {
-            IApplication application  = (IApplication) compositeBundles[i].loadAdapter(IApplication.class,
null);
-            IModule[] childs = application.getModules();
-            for (int j = 0; j < childs.length; j++) {
-                if (childs[j].equals(module))
-                    list.add(compositeBundles[i]);
+  
+            IModule[] composites = ServerUtil.getModules(OsgiConstants.COMPOSITE_BUNDLE);
+            for (int i = 0; i < composites.length; i++) {
+                FlatComponentDeployable composite = (FlatComponentDeployable) composites[i].loadAdapter(FlatComponentDeployable.class,
 null);
+                IModule[] modules = composite.getModules();
+                for (int j = 0; j < modules.length; j++) {
+                    if (modules[j].equals(module))
+                        list.add(composites[i]);
+                }
             }
         }
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java?rev=949464&r1=949463&r2=949464&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoUtils.java
Sun May 30 03:22:07 2010
@@ -16,8 +16,6 @@
  */
 package org.apache.geronimo.st.v30.core;
 
-import com.ibm.etools.aries.internal.core.IAriesModuleConstants;
-
 import javax.enterprise.deploy.shared.ModuleType;
 import javax.xml.bind.JAXBElement;
 
@@ -29,6 +27,7 @@ import org.apache.geronimo.jee.openejb.O
 import org.apache.geronimo.jee.web.WebApp;
 import org.apache.geronimo.st.v30.core.internal.Trace;
 import org.apache.geronimo.st.v30.core.jaxb.JAXBUtils;
+import org.apache.geronimo.st.v30.core.osgi.OsgiConstants;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.IPath;
@@ -80,15 +79,15 @@ public class GeronimoUtils {
     }
     
     public static boolean isEBAModule(IModule module) {
-        return IAriesModuleConstants.OSGI_APP.equals(module.getModuleType().getId());
+        return OsgiConstants.APPLICATION.equals(module.getModuleType().getId());
     }
     
     public static boolean isCBAModule(IModule module) {
-        return IAriesModuleConstants.OSGI_COMP_BUNDLE.equals(module.getModuleType().getId());
+        return OsgiConstants.COMPOSITE_BUNDLE.equals(module.getModuleType().getId());
     }
     
     public static boolean isBundleModule(IModule module) {
-        return IAriesModuleConstants.OSGI_BUNDLE.equals(module.getModuleType().getId());
+        return OsgiConstants.COMPOSITE_BUNDLE.equals(module.getModuleType().getId());
     }
     
     public static ModuleType getJSR88ModuleType(IModule module) {

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java?rev=949464&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
Sun May 30 03:22:07 2010
@@ -0,0 +1,58 @@
+/* 
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v30.core.osgi;
+
+import org.apache.geronimo.st.v30.core.internal.Trace;
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.wst.server.core.IModule;
+import org.osgi.framework.Bundle;
+
+/**
+ * <b>AriesHelper</b> is a static helper class used to encapsulate the functions
related to the installation of the 
+ * Aries OSGi tooling plugins (i.e., whether they are installed or not). They are optional
and have to be manually 
+ * installed by the GEP user(s).
+ */
+public final class AriesHelper {
+
+    private AriesHelper() {
+    }
+    
+    
+    /**
+     * Determine if the Aries OSGi tooling plugins are installed. They are optional and have
to be manually installed 
+     * by the GEP user(s).
+     *
+     * @return true or false
+     */
+    public static boolean isAriesInstalled() {
+        Trace.tracePoint("Entry", "AriesHelper.isAriesInstalled");
+
+        Bundle ariesCore = Platform.getBundle("com.ibm.etools.aries.core");
+        Bundle ariesUI   = Platform.getBundle("com.ibm.etools.aries.ui");
+
+        if (ariesCore != null && ariesCore.getState() != Bundle.UNINSTALLED &&
+            ariesUI != null && ariesUI.getState() != Bundle.UNINSTALLED) {
+    
+            Trace.tracePoint("Exit", "AriesHelper.isAriesInstalled", true);
+            return true;
+        }
+    
+        Trace.tracePoint("Exit", "AriesHelper.isAriesInstalled", false);
+        return false;
+    }
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java?rev=949464&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
Sun May 30 03:22:07 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v30.core.osgi;
+
+public final class OsgiConstants {
+
+    public final static String APPLICATION = "osgi.app"; 
+    public final static String APPLICATION_EXTENSION = ".eba"; 
+    public final static String APPLICATION_DATAMODEL_PROVIDER_ID = "osgi.application.datamodelprovider";
+
+    public final static String BUNDLE = "osgi.bundle"; 
+    public final static String BUNDLE_EXTENSION = ".jar"; 
+    public final static String BUNDLE_DATAMODEL_PROVIDER_ID = "osgi.bundle.datamodelprovider";
+
+    public final static String COMPOSITE_BUNDLE = "osgi.comp"; 
+    public final static String COMPOSITE_BUNDLE_EXTENSION = ".cba";  
+    public final static String COMPOSITE_BUNDLE_DATAMODEL_PROVIDER_ID = "osgi.composite.datamodelprovider";
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/OsgiConstants.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message