savara SVN: r189 - tools/eclipse/trunk/plugins/eclipse-build.
by do-not-reply@jboss.org
Author: objectiser
Date: 2010-03-07 07:59:22 -0500 (Sun, 07 Mar 2010)
New Revision: 189
Modified:
tools/eclipse/trunk/plugins/eclipse-build/allElements.xml
tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml
Log:
Changed build order.
Modified: tools/eclipse/trunk/plugins/eclipse-build/allElements.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/allElements.xml 2010-03-06 22:43:48 UTC (rev 188)
+++ tools/eclipse/trunk/plugins/eclipse-build/allElements.xml 2010-03-07 12:59:22 UTC (rev 189)
@@ -14,50 +14,52 @@
<target name="org.scribble.feature" if="mavenCompilePhase">
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.jboss.savara.tools.bpel.feature" />
+ <property name="id" value="org.scribble.feature" />
</ant>
+
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.jboss.savara.tools.jbossesb.feature" />
+ <property name="id" value="org.scribble.conversation.feature" />
</ant>
+ <ant antfile="${genericTargets}" target="${target}">
+ <property name="type" value="feature" />
+ <property name="id" value="org.scribble.experimental.feature" />
+ </ant>
+
<!--
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.pi4soa.bpmn.feature" />
+ <property name="id" value="org.scribble.java.feature" />
</ant>
-->
+
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.pi4soa.monitor.feature" />
+ <property name="id" value="org.scribble.pi4soa.feature" />
</ant>
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.scribble.conversation.feature" />
+ <property name="id" value="org.scribble.protocol.feature" />
</ant>
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.scribble.experimental.feature" />
- </ant>
+ <property name="id" value="org.jboss.savara.tools.bpel.feature" />
+ </ant>
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.scribble.feature" />
+ <property name="id" value="org.jboss.savara.tools.jbossesb.feature" />
</ant>
-
<!--
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.scribble.java.feature" />
+ <property name="id" value="org.pi4soa.bpmn.feature" />
</ant>
-->
-
<ant antfile="${genericTargets}" target="${target}">
<property name="type" value="feature" />
- <property name="id" value="org.scribble.pi4soa.feature" />
+ <property name="id" value="org.pi4soa.monitor.feature" />
</ant>
- <ant antfile="${genericTargets}" target="${target}">
- <property name="type" value="feature" />
- <property name="id" value="org.scribble.protocol.feature" />
- </ant>
+
</target>
@@ -68,36 +70,18 @@
<!-- Add one target for each root element and each configuration -->
<!-- Replace element.id with the id of the top level element being built -->
<!-- ===================================================================== -->
- <target name="assemble.org.jboss.savara.tools.bpel.feature">
- <property name="archiveName" value="${org.jboss.savara.tools.bpel.zipFile}"/>
+ <target name="assemble.org.scribble.feature">
+ <property name="archiveName" value="${org.scribble.zipFile}"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
- <target name="assemble.org.jboss.savara.tools.jbossesb.feature">
- <property name="archiveName" value="${org.jboss.savara.tools.jbossesb.zipFile}"/>
+ <target name="assemble.org.scribble.experimental.feature">
+ <property name="archiveName" value="${org.scribble.experimental.zipFile}"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
- <!--
- <target name="assemble.org.pi4soa.bpmn.feature">
- <property name="archiveName" value="${org.pi4soa.bpmn.zipFile}"/>
- <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
- </target>
- -->
- <target name="assemble.org.pi4soa.monitor.feature">
- <property name="archiveName" value="${org.pi4soa.monitor.zipFile}"/>
- <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
- </target>
<target name="assemble.org.scribble.conversation.feature">
<property name="archiveName" value="${org.scribble.conversation.zipFile}"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
- <target name="assemble.org.scribble.experimental.feature">
- <property name="archiveName" value="${org.scribble.experimental.zipFile}"/>
- <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
- </target>
- <target name="assemble.org.scribble.feature">
- <property name="archiveName" value="${org.scribble.zipFile}"/>
- <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
- </target>
<!--
<target name="assemble.org.scribble.java.feature">
@@ -114,5 +98,24 @@
<property name="archiveName" value="${org.scribble.protocol.zipFile}"/>
<ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
</target>
+
+ <target name="assemble.org.jboss.savara.tools.bpel.feature">
+ <property name="archiveName" value="${org.jboss.savara.tools.bpel.zipFile}"/>
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+ </target>
+ <target name="assemble.org.jboss.savara.tools.jbossesb.feature">
+ <property name="archiveName" value="${org.jboss.savara.tools.jbossesb.zipFile}"/>
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+ </target>
+ <!--
+ <target name="assemble.org.pi4soa.bpmn.feature">
+ <property name="archiveName" value="${org.pi4soa.bpmn.zipFile}"/>
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+ </target>
+ -->
+ <target name="assemble.org.pi4soa.monitor.feature">
+ <property name="archiveName" value="${org.pi4soa.monitor.zipFile}"/>
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}"/>
+ </target>
</project>
Modified: tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml 2010-03-06 22:43:48 UTC (rev 188)
+++ tools/eclipse/trunk/plugins/eclipse-build/installJBossTools.xml 2010-03-07 12:59:22 UTC (rev 189)
@@ -159,7 +159,7 @@
</echo>
<mkdir dir="${p2.director.install.path}"/>
- <chmod perm="ugo+rwx" file="${p2.director.install.path}/eclipse"/>
+ <chmod perm="777" file="${p2.director.install.path}/eclipse"/>
<exec executable="${p2.director.install.path}/eclipse" failonerror="true" dir="${p2.director.install.path}" timeout="900000" taskname="p2.dir">
<arg line=" -vm ${JAVA_HOME}/bin/java"/>
<!-- deprecated application for Eclipse 3.4: org.eclipse.equinox.p2.director.app.application -->
14 years, 1 month
savara SVN: r188 - tools/eclipse/trunk/plugins/eclipse-build.
by do-not-reply@jboss.org
Author: objectiser
Date: 2010-03-06 17:43:48 -0500 (Sat, 06 Mar 2010)
New Revision: 188
Modified:
tools/eclipse/trunk/plugins/eclipse-build/
Log:
Ignore target and ant-contrib.jar
Property changes on: tools/eclipse/trunk/plugins/eclipse-build
___________________________________________________________________
Name: svn:ignore
+ target
ant-contrib.jar
14 years, 1 month
savara SVN: r187 - tools/eclipse/trunk/plugins/eclipse-build.
by do-not-reply@jboss.org
Author: objectiser
Date: 2010-03-06 17:37:56 -0500 (Sat, 06 Mar 2010)
New Revision: 187
Modified:
tools/eclipse/trunk/plugins/eclipse-build/build.properties
tools/eclipse/trunk/plugins/eclipse-build/pom.xml
tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml
Log:
Updated to remove local configuration paths.
Modified: tools/eclipse/trunk/plugins/eclipse-build/build.properties
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/build.properties 2010-03-06 22:12:20 UTC (rev 186)
+++ tools/eclipse/trunk/plugins/eclipse-build/build.properties 2010-03-06 22:37:56 UTC (rev 187)
@@ -40,8 +40,6 @@
buildDirectory=${base}/eclipse.build
baseLocation=${base}/eclipse
-eclipseDir=/home/gbrown/repositories/savara/tools-eclipse-trunk/plugins/eclipse-build/target
-
#Os/Ws/Arch/nl of the eclipse specified by baseLocation
#baseos=win32
#basews=win32
Modified: tools/eclipse/trunk/plugins/eclipse-build/pom.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/pom.xml 2010-03-06 22:12:20 UTC (rev 186)
+++ tools/eclipse/trunk/plugins/eclipse-build/pom.xml 2010-03-06 22:37:56 UTC (rev 187)
@@ -28,7 +28,7 @@
<tasks>
<property name="eclipse.home" value="target/eclipse" />
- <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
+ <property name="localEclipseDrop" value="${basedir}/../../../local-eclipse-drop-mirror" />
<delete failonerror="false" dir="target/eclipse.build"/>
@@ -38,6 +38,7 @@
<ant target="setupLocalEclipse" antfile="setupEclipse.xml">
<property name="localEclipseDrop" value="${localEclipseDrop}" />
+ <property name="JAVA_HOME" value="${env.JAVA_HOME}" />
</ant>
<java jar="${eclipse.home}/plugins/org.eclipse.equinox.launcher_1.0.201.R35x_v20090715.jar"
Modified: tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml
===================================================================
--- tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml 2010-03-06 22:12:20 UTC (rev 186)
+++ tools/eclipse/trunk/plugins/eclipse-build/setupEclipse.xml 2010-03-06 22:37:56 UTC (rev 187)
@@ -2,7 +2,8 @@
<property file="build.properties"/>
- <property name="localEclipseDrop" value="${basedir}/local-eclipse-drop-mirror" />
+ <property name="localEclipseDrop" value="${basedir}/../../../local-eclipse-drop-mirror" />
+ <property name="eclipseDir" value="${basedir}/target" />
<property name="dependenciesDir" value="${basedir}/dependencies" />
<!-- set the OS name, make sure each condition is mutally exclusive -->
@@ -51,6 +52,7 @@
</target>
<target name="getEclipseJar" depends="checkEclipseJar" unless="skipGetEclipseJar">
+
<mkdir dir="${localEclipseDrop}/eclipse/${eclipseBuildRevision}" />
<get usetimestamp="true" src="${eclipseURL}/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.${download.extension}"
@@ -88,6 +90,7 @@
</target>
<target name="checkEclipseJar">
+<echo>CHECK ECLIPSE JAR: ${localEclipseDrop} ${env.JAVA_HOME}</echo>
<available file="${localEclipseDrop}/eclipse/${eclipseBuildRevision}/eclipse-SDK-${eclipseBuildId}-${download.type}.zip" property="skipGetEclipseJar" />
</target>
@@ -151,7 +154,7 @@
<property name="targetDir" value="${eclipseDir}/eclipse"/>
<property name="install" value="org.pi4soa.core.feature.feature.group"/>
<property name="eclipseDir" value="${eclipseDir}" />
- <property name="JAVA_HOME" value="/home/gbrown/tools/jdk1.6.0_18" />
+ <property name="JAVA_HOME" value="${JAVA_HOME}" />
</ant>
</target>
14 years, 1 month
savara SVN: r186 - in tools/eclipse/trunk/plugins: org.scribble.conformance and 23 other directories.
by do-not-reply@jboss.org
Author: objectiser
Date: 2010-03-06 17:12:20 -0500 (Sat, 06 Mar 2010)
New Revision: 186
Modified:
tools/eclipse/trunk/plugins/org.pi4soa.monitor/
tools/eclipse/trunk/plugins/org.scribble.conformance/
tools/eclipse/trunk/plugins/org.scribble.contract.model/
tools/eclipse/trunk/plugins/org.scribble.conversation.comparator/
tools/eclipse/trunk/plugins/org.scribble.conversation.eclipse/
tools/eclipse/trunk/plugins/org.scribble.conversation.export.monitor/
tools/eclipse/trunk/plugins/org.scribble.conversation.export.text/
tools/eclipse/trunk/plugins/org.scribble.conversation.model/
tools/eclipse/trunk/plugins/org.scribble.conversation.parser/
tools/eclipse/trunk/plugins/org.scribble.conversation.projector/
tools/eclipse/trunk/plugins/org.scribble.conversation.validation/
tools/eclipse/trunk/plugins/org.scribble.core/
tools/eclipse/trunk/plugins/org.scribble.eclipse/
tools/eclipse/trunk/plugins/org.scribble.expression.xpath/
tools/eclipse/trunk/plugins/org.scribble.lang.comparator/
tools/eclipse/trunk/plugins/org.scribble.lang.model/
tools/eclipse/trunk/plugins/org.scribble.monitor/
tools/eclipse/trunk/plugins/org.scribble.pi4soa.cdm/
tools/eclipse/trunk/plugins/org.scribble.protocol.comparator/
tools/eclipse/trunk/plugins/org.scribble.protocol.eclipse/
tools/eclipse/trunk/plugins/org.scribble.protocol.export.text/
tools/eclipse/trunk/plugins/org.scribble.protocol.model/
tools/eclipse/trunk/plugins/org.scribble.protocol.parser/
tools/eclipse/trunk/plugins/org.scribble.protocol.projector/
tools/eclipse/trunk/plugins/org.scribble.protocol.validation/
Log:
Ignore class folders.
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conformance
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.contract.model
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.comparator
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.eclipse
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.export.monitor
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.export.text
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.model
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.parser
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.projector
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.conversation.validation
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.core
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.eclipse
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.expression.xpath
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.lang.comparator
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.lang.model
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.monitor
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.pi4soa.cdm
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.comparator
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.eclipse
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.export.text
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.model
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.parser
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.projector
___________________________________________________________________
Name: svn:ignore
+ classes
Property changes on: tools/eclipse/trunk/plugins/org.scribble.protocol.validation
___________________________________________________________________
Name: svn:ignore
+ classes
14 years, 1 month
savara SVN: r185 - in tools/eclipse/trunk/plugins: org.scribble.monitor and 8 other directories.
by do-not-reply@jboss.org
Author: objectiser
Date: 2010-03-06 16:48:11 -0500 (Sat, 06 Mar 2010)
New Revision: 185
Removed:
tools/eclipse/trunk/plugins/org.scribble.lang.model/classes/
tools/eclipse/trunk/plugins/org.scribble.monitor/classes/
tools/eclipse/trunk/plugins/org.scribble.pi4soa.cdm/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.comparator/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.eclipse/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.export.text/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.model/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.parser/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.projector/classes/
tools/eclipse/trunk/plugins/org.scribble.protocol.validation/classes/
Log:
Remove class files.
14 years, 1 month