geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Tim McConnell <tim.mcco...@gmail.com>
Subject Re: svn commit: r946857 - in /geronimo/devtools/eclipse-plugin/trunk: eclipse/ plugins/org.apache.geronimo.st.v30.core/META-INF/ plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/
Date Wed, 26 May 2010 03:17:43 GMT
Hi Delos, I've revert the change to the build script since we cannot 
automatically download the free Aries tools due to licensing. Later this 
week I'll remove both the runtime and build dependencies we have on the 
free Aries tooling. If you have trouble building the GEP until then you 
can manually download the free Aries tools, unzip them into the eclipse 
  subdirectory of your m2 repo, and then invoke the no-eclipse-downloads 
maven profile (i.e., mvn install -Pno-eclipse-downloads). Thanks



On 5/20/2010 11:25 PM, delos@apache.org wrote:
> Author: delos
> Date: Fri May 21 03:25:16 2010
> New Revision: 946857
>
> URL: http://svn.apache.org/viewvc?rev=946857&view=rev
> Log:
> GERONIMODEVTOOLS-614 update build script to download free Aries tool
>
> Modified:
>      geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
>      geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
>      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/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/eclipse/build.xml
> URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=946857&r1=946856&r2=946857&view=diff
> ==============================================================================
> --- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
> +++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Fri May 21 03:25:16 2010
> @@ -44,6 +44,11 @@
>           <property name="tptp-version"                   value="4.7.0M7"/>
>           <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"/>
> +
> +<!-- free Aries tool download URL from ibm site. -->
> +<property name="aries-tools-version"            value="1.0.0.0"/>
> +<property name="ariestools"                     value="OSGI_Tools_${aries-tools-version}.zip"/>
> +<property name="free_aries_tool_url"            value="https://www6.software.ibm.com/sdfdl/v2/regs2/OSGI_Tools/Xa.2/Xb.Bhtd1U2AGuQI_IMsx-2bmOlvfZa89CHrFb1bAYveFA/Xc.OSGi_Tools_1.0.0.0.zip/Xd./Xf.LPr.U1ay/Xg.5462396/Xi.swg-osgitools/XY.regsrvs/XZ.RNxpGEd_bq2XMRbT9BTu6wl2SoM/OSGi_Tools_1.0.0.0.zip"/>
>
>           <property name="protocol"                       value="&amp;r=1&amp;protocol=http"/>
>       </target>
> @@ -72,6 +77,30 @@
>                      overwrite="true"/>
>       </target>
>
> +<target name="free_aries_tool" depends="init" description="Download free Aries tools
package">
> +<echo>#################################################################################</echo>
> +<echo>##</echo>
> +<echo>## Downloading: ${ariestools}</echo>
> +<echo>##</echo>
> +<echo>## From: ${free_aries_tool_url}</echo>
> +<echo>##</echo>
> +<echo>#################################################################################</echo>
> +<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
> +<get src="${free_aries_tool_url}"
> +                 dest="${LOCAL_M2_REPO}/eclipse-downloads/${ariestools}"
> +                 verbose="true"
> +                 ignoreerrors="true"
> +                 usetimestamp="true"/>
> +<echo>#################################################################################</echo>
> +<echo>##</echo>
> +<echo>## Unzipping: ${ariestools}</echo>
> +<echo>##</echo>
> +<echo>#################################################################################</echo>
> +<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${ariestools}"
> +                   dest="${LOCAL_M2_REPO}/eclipse/eclipse"
> +                   overwrite="true"/>
> +</target>
> +
>       <target name="win" depends="init" description="Download Windows-specific artifact(s)">
>              <antcall target="win64"></antcall>
>              <antcall target="win32"></antcall>
>
> Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml
> URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml?rev=946857&r1=946856&r2=946857&view=diff
> ==============================================================================
> --- geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml (original)
> +++ geronimo/devtools/eclipse-plugin/trunk/eclipse/pom.xml Fri May 21 03:25:16 2010
> @@ -47,6 +47,7 @@
>                                   <ant antfile="${basedir}/build.xml">
>                                       <target name="${eclipsePlatformFamily}"></target>
>                                       <target name="tptp"></target>
> +<target name="free_aries_tool"></target>
>                                   </ant>
>                               </tasks>
>                           </configuration>
>
> 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=946857&r1=946856&r2=946857&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
Fri May 21 03:25:16 2010
> @@ -7,7 +7,7 @@ Bundle-Activator: org.apache.geronimo.st
>   Bundle-Vendor: %providerName
>   Bundle-Localization: plugin
>   Require-Bundle:
> - com.ibm.etools.aries.core,
> + com.ibm.etools.aries.core;resolution:=optional,
>    org.apache.geronimo.jee.v21.jaxbmodel,
>    org.apache.geronimo.runtime.v30,
>    org.eclipse.core.commands,
>
> 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=946857&r1=946856&r2=946857&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
Fri May 21 03:25:16 2010
> @@ -210,11 +210,11 @@ 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)) {
> +        } else if (IAriesModuleConstants.OSGI_APP_MODULE.equals(type)) {
>               return DataModelFactory.createDataModel(new ApplicationExportDataModelProvider());
>           } else if (IAriesModuleConstants.OSGI_COMP_BUNDLE.equals(type)) {
>               return DataModelFactory.createDataModel(new ApplicationExportDataModelProvider());
> -        } else if (IAriesModuleConstants.OSGI_BUNDLE.equals(type)) {
> +        } else if (IAriesModuleConstants.OSGI_MODULE.equals(type)) {
>               return DataModelFactory.createDataModel(new BundleExportDataModelProvider());
>           }
>
>
> 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=946857&r1=946856&r2=946857&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
Fri May 21 03:25:16 2010
> @@ -199,7 +199,7 @@ abstract public class GeronimoServerDele
>                           }
>                       }
>                   }
> -                else if (IAriesModuleConstants.OSGI_APP.equals(moduleType.getId()))
{
> +                else if (IAriesModuleConstants.OSGI_APP_MODULE.equals(moduleType.getId()))
{
>                       IApplication osgiApplication = (IApplication) module[0].loadAdapter(IApplication.class,
null);
>                       IModule[] modules = osgiApplication.getModules();
>                       if (modules != null) {
> @@ -550,7 +550,7 @@ abstract public class GeronimoServerDele
>               }
>           }
>
> -        IModule[] applicationBundles = ServerUtil.getModules(IAriesModuleConstants.OSGI_APP);
> +        IModule[] applicationBundles = ServerUtil.getModules(IAriesModuleConstants.OSGI_APP_MODULE);
>           for (int i = 0; i<  applicationBundles.length; i++) {
>               IApplication application = (IApplication) applicationBundles[i].loadAdapter(IApplication.class,
null);
>               IModule[] childs = application.getModules();
>
> 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=946857&r1=946856&r2=946857&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
Fri May 21 03:25:16 2010
> @@ -80,7 +80,7 @@ public class GeronimoUtils {
>       }
>
>       public static boolean isEBAModule(IModule module) {
> -        return IAriesModuleConstants.OSGI_APP.equals(module.getModuleType().getId());
> +        return IAriesModuleConstants.OSGI_APP_MODULE.equals(module.getModuleType().getId());
>       }
>
>       public static boolean isCBAModule(IModule module) {
> @@ -88,7 +88,7 @@ public class GeronimoUtils {
>       }
>
>       public static boolean isBundleModule(IModule module) {
> -        return IAriesModuleConstants.OSGI_BUNDLE.equals(module.getModuleType().getId());
> +        return IAriesModuleConstants.OSGI_MODULE.equals(module.getModuleType().getId());
>       }
>
>       public static ModuleType getJSR88ModuleType(IModule module) {
>
>


-- 
Thanks,
Tim McConnell

Mime
View raw message