You are viewing a plain text version of this content. The canonical link for it is here.
Posted to easyant-commits@incubator.apache.org by hi...@apache.org on 2012/12/28 14:41:16 UTC
svn commit: r1426523 - in /incubator/easyant/core/trunk: ./ .settings/
experiment/repo/ experiment/repo/org.apache.ant/ant-groovyfront/1.0.0/
experiment/repo/org.apache.easyant/groovyfrontend/1.0/
experiment/repo/org.apache.easyant/groovyfrontend/1.0/a...
Author: hibou
Date: Fri Dec 28 14:41:15 2012
New Revision: 1426523
URL: http://svn.apache.org/viewvc?rev=1426523&view=rev
Log:
- improve the boostrap build so we can invoke an easyant target
- rework the distrib: we will a source only and a binary+doc distribs
- replace tabs by space in module.ant
- fix the NOTICE file
- fix missing ASL headers
Modified:
incubator/easyant/core/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/easyant/core/trunk/.settings/org.eclipse.jdt.ui.prefs
incubator/easyant/core/trunk/NOTICE
incubator/easyant/core/trunk/build.xml
incubator/easyant/core/trunk/easyant.eclipse.formatter.xml
incubator/easyant/core/trunk/experiment/repo/.project
incubator/easyant/core/trunk/experiment/repo/ivysettings.xml
incubator/easyant/core/trunk/experiment/repo/org.apache.ant/ant-groovyfront/1.0.0/ivy.xml
incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/antscripts/groovyfrontend.xml
incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/ivy.xml
incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/antscripts/hellogroovy.groovy
incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/ivy.xml
incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/antscripts/helloworld.xml
incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/ivy.xml
incubator/easyant/core/trunk/experiment/sample/.project
incubator/easyant/core/trunk/experiment/sample/build.properties
incubator/easyant/core/trunk/experiment/sample/build.xml
incubator/easyant/core/trunk/experiment/sample/ea-ivy.xml
incubator/easyant/core/trunk/experiment/sample/ea-ivysettings.xml
incubator/easyant/core/trunk/module.ant
incubator/easyant/core/trunk/src/documentation/images/defaultLifecycle.graphml
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ExecutionStatus.java
incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java
Modified: incubator/easyant/core/trunk/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/.settings/org.eclipse.jdt.core.prefs?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/easyant/core/trunk/.settings/org.eclipse.jdt.core.prefs Fri Dec 28 14:41:15 2012
@@ -1,3 +1,21 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
#Tue Nov 22 01:35:46 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
Modified: incubator/easyant/core/trunk/.settings/org.eclipse.jdt.ui.prefs
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/.settings/org.eclipse.jdt.ui.prefs?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/.settings/org.eclipse.jdt.ui.prefs (original)
+++ incubator/easyant/core/trunk/.settings/org.eclipse.jdt.ui.prefs Fri Dec 28 14:41:15 2012
@@ -1,3 +1,21 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
#Sun Sep 25 15:18:40 CEST 2011
eclipse.preferences.version=1
formatter_profile=_Easyant
Modified: incubator/easyant/core/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/NOTICE?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/NOTICE (original)
+++ incubator/easyant/core/trunk/NOTICE Fri Dec 28 14:41:15 2012
@@ -1,24 +1,5 @@
-=========================================================================
-== NOTICE file corresponding to the section 4 d of ==
-== the Apache License, Version 2.0, ==
-== in this case for the EasyAnt distribution. ==
-=========================================================================
+Apache Easyant (TM)
+Copyright 2007-2012 The Apache Software Foundation
This product includes software developed by
-the EasyAnt project members, who are :
-Jean Louis Boudart
-Xavier Hanin
-Siddhartha Purkayastha
-Jérôme Benois
-Jason Trump
-Nicolas Lalevée
-
-The following people contributed to EasyAnt :
-Markus M. May
-Nicolas Gapaillard
-
-This software is based on Apache Ant and Apache Ivy,
-which are open source software, available under
-the terms of an Apache v2 License
-The original software and related information are available
-at http://ant.apache.org/ and http://ant.apache.org/ivy/.
+The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/easyant/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/build.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/build.xml (original)
+++ incubator/easyant/core/trunk/build.xml Fri Dec 28 14:41:15 2012
@@ -19,14 +19,10 @@
<target name="ivy:init">
<mkdir dir="${bootstrap.dir}"/>
- <property name="ivy.version" value="2.3.0-rc2"/>
- <property name="ivy.jar.url" value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
- <get src="${ivy.jar.url}" dest="${bootstrap.dir}/ivy.jar" usetimestamp="true"/>
- <path id="ivy.lib.path">
- <fileset dir="${bootstrap.dir}" includes="ivy.jar"/>
- </path>
- <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path" />
+ <property name="ivy.version" value="2.3.0-rc2"/>
+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar" dest="${user.home}/.ivy2/jars/ivy-${ivy.version}.jar" usetimestamp="true"/>
+ <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${user.home}/.ivy2/jars/ivy-${ivy.version}.jar" />
</target>
<target name="clean-cache">
@@ -71,45 +67,18 @@
<jar destfile="${bootstrap.dir}/easyant.jar" basedir="${bootstrap.dir}/classes" />
</target>
- <target name="dist" depends="jar">
- <property name="bootstrap.fork" value="false"/>
- <java classname="org.apache.easyant.core.EasyAntMain" failonerror="true" fork="${bootstrap.fork}">
- <classpath>
- <path refid="default.classpath" />
- <pathelement location="${bootstrap.dir}/easyant.jar" />
- <!--
- Ant will try to find the tools.jar using java.home System property, but sometimes
- this points to JDK, and sometimes to JRE.
- See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4200300
- -->
- <path path="${java.class.path}"/>
- </classpath>
- <sysproperty key="easyant.home" file="${basedir}" />
- <arg line="-configfile ${basedir}/easyant-conf.xml" />
- <arg line="-f ${basedir}/module.ivy" />
- <arg line="-Dskip.svn=true"/>
- <arg line="package-full-distribution" />
- </java>
- </target>
-
- <target name="distribution" depends="jar">
- <property name="bootstrap.fork" value="false"/>
- <java classname="org.apache.easyant.core.EasyAntMain" failonerror="true" fork="${bootstrap.fork}">
+ <target name="run" depends="jar">
+ <property name="target" value="distribution" />
+ <java classname="org.apache.easyant.core.EasyAntMain" failonerror="true" fork="true">
<classpath>
<path refid="default.classpath" />
<pathelement location="${bootstrap.dir}/easyant.jar" />
- <!--
- Ant will try to find the tools.jar using java.home System property, but sometimes
- this points to JDK, and sometimes to JRE.
- See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4200300
- -->
- <path path="${java.class.path}"/>
</classpath>
<sysproperty key="easyant.home" file="${basedir}" />
<arg line="-configfile ${basedir}/easyant-conf.xml" />
<arg line="-f ${basedir}/module.ivy" />
<arg line="-Dskip.svn=true"/>
- <arg line="distribution" />
+ <arg line="${target}" />
</java>
</target>
Modified: incubator/easyant/core/trunk/easyant.eclipse.formatter.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/easyant.eclipse.formatter.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/easyant.eclipse.formatter.xml (original)
+++ incubator/easyant/core/trunk/easyant.eclipse.formatter.xml Fri Dec 28 14:41:15 2012
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<profiles version="11">
<profile kind="CodeFormatterProfile" name="EasyAnt" version="11">
<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
Modified: incubator/easyant/core/trunk/experiment/repo/.project
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/.project?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/.project (original)
+++ incubator/easyant/core/trunk/experiment/repo/.project Fri Dec 28 14:41:15 2012
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<projectDescription>
<name>anthill-repo</name>
<comment></comment>
Modified: incubator/easyant/core/trunk/experiment/repo/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/ivysettings.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/ivysettings.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/ivysettings.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivysettings>
<caches>
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.ant/ant-groovyfront/1.0.0/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.ant/ant-groovyfront/1.0.0/ivy.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.ant/ant-groovyfront/1.0.0/ivy.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.ant/ant-groovyfront/1.0.0/ivy.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="org.apache.ant" module="ant-groovyfront" revision="1.0.0" />
<configurations defaultconfmapping="default->default;sources->sources;javadoc->javadoc">
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/antscripts/groovyfrontend.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/antscripts/groovyfrontend.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/antscripts/groovyfrontend.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/antscripts/groovyfrontend.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<project name="org.apache.easyant#groovyfrontend">
<typedef name="groovyfrontend" classname="org.apache.ant.groovyfront.GroovyFrontProjectHelper">
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/ivy.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/ivy.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/groovyfrontend/1.0/ivy.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="org.apache.easyant" module="groovyfrontend" revision="1.0" />
<configurations>
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/antscripts/hellogroovy.groovy
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/antscripts/hellogroovy.groovy?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/antscripts/hellogroovy.groovy (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/antscripts/hellogroovy.groovy Fri Dec 28 14:41:15 2012
@@ -1,3 +1,20 @@
+/*
+ * 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.
+ *
+ */
target(name: "hellogroovy") {
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/ivy.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/ivy.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/hellogroovy/1.0/ivy.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="org.apache.easyant" module="hellogroovy" revision="1.0" />
<publications>
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/antscripts/helloworld.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/antscripts/helloworld.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/antscripts/helloworld.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/antscripts/helloworld.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<project name="org.apache.easyant#helloworld">
<target name="hello">
Modified: incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/ivy.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/ivy.xml (original)
+++ incubator/easyant/core/trunk/experiment/repo/org.apache.easyant/helloworld/1.0/ivy.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="org.apache.easyant" module="helloworld" revision="1.0" />
<publications>
Modified: incubator/easyant/core/trunk/experiment/sample/.project
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/sample/.project?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/sample/.project (original)
+++ incubator/easyant/core/trunk/experiment/sample/.project Fri Dec 28 14:41:15 2012
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
<projectDescription>
<name>anthill-sample</name>
<comment></comment>
Modified: incubator/easyant/core/trunk/experiment/sample/build.properties
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/sample/build.properties?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/sample/build.properties (original)
+++ incubator/easyant/core/trunk/experiment/sample/build.properties Fri Dec 28 14:41:15 2012
@@ -1 +1,19 @@
+# ***************************************************************
+# * 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.
+# ***************************************************************
#easyant.localrepo.basedir=${basedir}/localrepo
Modified: incubator/easyant/core/trunk/experiment/sample/build.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/sample/build.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/sample/build.xml (original)
+++ incubator/easyant/core/trunk/experiment/sample/build.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<project name="myproject" default="hello">
<property file="build.properties" />
Modified: incubator/easyant/core/trunk/experiment/sample/ea-ivy.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/sample/ea-ivy.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/sample/ea-ivy.xml (original)
+++ incubator/easyant/core/trunk/experiment/sample/ea-ivy.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="com.acme" module="myproject_easyant" />
<dependencies>
Modified: incubator/easyant/core/trunk/experiment/sample/ea-ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/experiment/sample/ea-ivysettings.xml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/experiment/sample/ea-ivysettings.xml (original)
+++ incubator/easyant/core/trunk/experiment/sample/ea-ivysettings.xml Fri Dec 28 14:41:15 2012
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivysettings>
<include file="${ivy.settings.dir}/../repo/ivysettings.xml" />
Modified: incubator/easyant/core/trunk/module.ant
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/module.ant?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/module.ant (original)
+++ incubator/easyant/core/trunk/module.ant Fri Dec 28 14:41:15 2012
@@ -16,46 +16,46 @@
-->
<project name="org.apache.easyant#easyant-core" xmlns:ea="antlib:org.apache.easyant" xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- Force compatibility to java 1.5 -->
- <property name="compile.java.target.version" value="1.5" />
- <property name="compile.java.source.version" value="1.5" />
+ <!-- Force compatibility to java 1.5 -->
+ <property name="compile.java.target.version" value="1.5" />
+ <property name="compile.java.source.version" value="1.5" />
- <property name="target.documentation.dir" value="${basedir}/target/documentation" />
- <property name="xooki.temp.dir" value="${basedir}/target/temp-doc" />
- <property name="xooki.resources.include.pattern" value="style/**,images/**,sortable.js" />
- <property name="eadoc.documentation.dir" value="${xooki.temp.dir}" />
+ <property name="target.documentation.dir" value="${basedir}/target/documentation" />
+ <property name="xooki.temp.dir" value="${basedir}/target/temp-doc" />
+ <property name="xooki.resources.include.pattern" value="style/**,images/**,sortable.js" />
+ <property name="eadoc.documentation.dir" value="${xooki.temp.dir}" />
- <property name="project.ivy.instance" value="easyant.ivy.instance" />
- <property name="release.resolver" value="easyant-shared-modules" />
- <property name="shared.resolver" value="easyant-shared-modules" />
+ <property name="project.ivy.instance" value="easyant.ivy.instance" />
+ <property name="release.resolver" value="easyant-shared-modules" />
+ <property name="shared.resolver" value="easyant-shared-modules" />
- <property name="retrieve.dependencies" value="true" />
+ <property name="retrieve.dependencies" value="true" />
- <property name="test.run.excludes.pattern" value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
+ <property name="test.run.excludes.pattern" value="**/EasyAntBaseTest*,**/*AntTestListener*,**/*AntOutputStream*" />
- <!-- override main artifact retrieve pattern -->
- <property name="retrieve.pattern.lib.main" value="${basedir}/lib/main/[artifact].[ext]" />
+ <!-- override main artifact retrieve pattern -->
+ <property name="retrieve.pattern.lib.main" value="${basedir}/lib/main/[artifact].[ext]" />
-
- <!-- Load external properties
+ <!-- Load external properties
/!\ This file will contains svn credentials so it should not be commited /!\
-->
- <property file="module.properties" />
+ <property file="module.properties" />
- <!--Loading build type -->
- <ea:build module="build-std-java" rev="0.9" />
+ <!--Loading build type -->
+ <ea:build module="build-std-java" rev="0.9" />
- <!-- Loading plugins -->
- <ea:plugin module="xooki" rev="0.9" as="xooki" />
- <ea:plugin module="scm-svn" rev="0.9" as="svn" />
- <ea:plugin module="javadoc" rev="0.9" as="javadoc" />
- <ea:plugin module="distribution" rev="0.9" as="distribution" />
+ <!-- Loading plugins -->
+ <ea:plugin module="xooki" rev="0.9" as="xooki" />
+ <ea:plugin module="scm-svn" rev="0.9" as="svn" />
+ <ea:plugin module="javadoc" rev="0.9" as="javadoc" />
+ <ea:plugin module="distribution" rev="0.9" as="distribution" />
+ <ea:plugin module="rat" rev="0.9" as="rat" />
- <extension-point name="distribution" description="create a distribution package" depends="package-jar:jar" />
- <property name="target.dist" value="${target}/dist" />
+ <extension-point name="distribution" description="create a distribution package" depends="package-jar:jar" />
+ <property name="target.dist" value="${target}/dist" />
- <target name="test-setup" description="add extra information to classpath for unit tests">
- <!--
+ <target name="test-setup" description="add extra information to classpath for unit tests">
+ <!--
our unit test requires the JDK tools.jar to run, which cannot be defined normally
in module.ivy dependencies.
@@ -63,203 +63,186 @@
this points to JDK, and sometimes to JRE.
See http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4200300
-->
- <augment id="run.test.classpath">
- <path path="${java.class.path}" />
- </augment>
- </target>
-
- <target name="prepare-distribution">
-
- <mkdir dir="${target.distributions}" />
- <mkdir dir="${target.documentation.dir}" />
-
- <patternset id="easyant-files.patternset">
- <exclude name="target/**" />
- <include name="lib/*.jar" />
-
- <include name="example/**" />
- <exclude name="example/**/bin/**" />
- <exclude name="example/**/lib/**" />
- <exclude name="example/**/target/**" />
-
- <include name="sample-easyant-ivysettings.xml" />
- <include name="easyant-conf.xml" />
- <include name="README" />
- <include name="NOTICE" />
- <include name="LICENSE" />
- </patternset>
-
- <patternset id="easyant-exec.patternset">
- <include name="bin/**" />
- </patternset>
-
- </target>
-
- <target name="stage-dist" depends="prepare-distribution, abstract-provisioning:provisioning">
-
- <mkdir dir="${target.dist}" />
-
- <copy todir="${target.dist}">
- <fileset dir="${basedir}">
- <patternset refid="easyant-files.patternset" />
- <patternset refid="easyant-exec.patternset" />
+ <augment id="run.test.classpath">
+ <path path="${java.class.path}" />
+ </augment>
+ </target>
+
+ <target name="prepare-distribution">
+
+ <mkdir dir="${target.distributions}" />
+ <mkdir dir="${target.documentation.dir}" />
+
+ <patternset id="easyant-files.patternset">
+ <exclude name="target/**" />
+ <include name="lib/*.jar" />
+
+ <include name="example/**" />
+ <exclude name="example/**/bin/**" />
+ <exclude name="example/**/lib/**" />
+ <exclude name="example/**/target/**" />
+
+ <include name="sample-easyant-ivysettings.xml" />
+ <include name="easyant-conf.xml" />
+ <include name="README" />
+ <include name="NOTICE" />
+ <include name="LICENSE" />
+ </patternset>
+
+ <patternset id="easyant-exec.patternset">
+ <include name="bin/**" />
+ </patternset>
+
+ </target>
+
+ <target name="stage-dist" depends="prepare-distribution, abstract-provisioning:provisioning">
+
+ <mkdir dir="${target.dist}" />
+
+ <copy todir="${target.dist}">
+ <fileset dir="${basedir}">
+ <patternset refid="easyant-files.patternset" />
+ <patternset refid="easyant-exec.patternset" />
<!--copy ivysettings.xml for developpers -->
<patternset includes="ivysettings.xml"/>
- </fileset>
- </copy>
+ </fileset>
+ </copy>
- <mkdir dir="${target.dist}/lib/" />
- <copy todir="${target.dist}/lib">
- <fileset dir="${basedir}/lib/main" />
- </copy>
- <copy file="${target.main.artifact}" todir="${target.dist}/lib" />
-
- <!-- makes easyant scripts executable -->
- <chmod perm="744" dir="${target.dist}">
- <patternset refid="easyant-exec.patternset" />
- </chmod>
-
- </target>
-
- <target name="dist" depends="package-jar:jar, stage-dist" description="update the dist directory (used for development)">
-
- <!-- declare distribution fileset for use in packaging targets -->
- <fileset id="easyant-dist.fileset" dir="${target.dist}">
- <patternset refid="easyant-files.patternset" />
- <patternset refid="easyant-exec.patternset" />
- </fileset>
-
- </target>
-
- <!-- Create a zip for distribution -->
- <target name="package-distribution" depends="populate-jar-repo, dist" description="package a distribution" extensionOf="distribution">
- <echo message="Packaging standard distribution." />
- <property name="root.dir" value="${ivy.module}-${ivy.revision}" />
- <bundle destfile="${target.distributions}/${ivy.module}-${version}">
- <zipfileset dir="${target.dist}" prefix="${root.dir}">
- <patternset refid="easyant-files.patternset" />
- </zipfileset>
- <!-- make scripts executable -->
- <zipfileset dir="${target.dist}" prefix="${root.dir}" filemode="744">
- <patternset refid="easyant-exec.patternset" />
- </zipfileset>
- <!-- ship the documentation -->
- <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc" />
- </bundle>
-
- </target>
-
- <target name="package-documentation" description="package the documentation" extensionOf="distribution" depends="xooki:generate">
- <echo message="Packaging documentation distribution." />
- <bundle destfile="${target.distributions}/${ivy.module}-${version}-docs">
- <zipfileset dir="${target.documentation.dir}" prefix="${ivy.module}-${ivy.revision}-docs" />
- </bundle>
- </target>
-
- <!-- Create a zip for full distribution -->
- <target name="package-full-distribution" depends="distribution:init, populate-jar-repo, dist, xooki:generate" description="package a distribution (including includes sources)" extensionOf="distribution">
- <echo message="Packaging full distribution." />
- <property name="full.root.dir" value="${ivy.module}-${ivy.revision}-full" />
- <bundle destfile="${target.distributions}/${ivy.module}-${version}-full">
- <zipfileset dir="${target.dist}" prefix="${full.root.dir}/dist">
- <patternset refid="easyant-files.patternset" />
- </zipfileset>
- <!-- make scripts executable -->
- <zipfileset dir="${target.dist}" prefix="${full.root.dir}/dist" filemode="744">
- <patternset refid="easyant-exec.patternset" />
- </zipfileset>
- <!-- ship the documentation -->
- <zipfileset dir="${target.documentation.dir}" prefix="${full.root.dir}/dist/doc" />
- <!-- easyant sources -->
- <zipfileset dir="${basedir}" prefix="${full.root.dir}/sources">
- <patternset>
- <include name="src/**"/>
- <include name="bin/**"/>
- <include name="example/**"/>
- <include name="module.ant"/>
- <include name="module.ivy"/>
- <include name="build.xml"/>
- <include name="easyant-conf.xml"/>
- <include name="ivysettings.xml"/>
- <include name="ivysettings-bootstrap.xml"/>
- <include name="sample-easyant-ivysettings.xml"/>
- <include name="NOTICE"/>
- <include name="README"/>
- <include name="LICENSE"/>
- <include name=".settings/**"/>
- <include name=".project"/>
- <include name=".classpath"/>
- </patternset>
- </zipfileset>
- </bundle>
- </target>
-
- <macrodef name="install-module">
- <attribute name="organisation" />
- <attribute name="module" />
- <attribute name="revision" />
- <sequential>
- <ivy:install matcher="exactOrRegexp" from="apache-easyant-plugins" to="core" organisation="@{organisation}" module="@{module}" revision="@{revision}" settingsRef="easyant.ivy.instance" overwrite="true" />
- </sequential>
- </macrodef>
-
- <macrodef name="install-buildtype">
- <attribute name="organisation" default="org.apache.easyant.buildtypes" />
- <attribute name="module" />
- <attribute name="revision" />
- <sequential>
- <install-module organisation="@{organisation}" module="@{module}" revision="@{revision}" />
- </sequential>
- </macrodef>
-
- <macrodef name="install-plugin">
- <attribute name="organisation" default="org.apache.easyant.plugins" />
- <attribute name="module" />
- <attribute name="revision" />
- <sequential>
- <install-module organisation="@{organisation}" module="@{module}" revision="@{revision}" />
- </sequential>
- </macrodef>
-
- <macrodef name="install-skeleton">
- <attribute name="organisation" default="org.apache.easyant.skeletons" />
- <attribute name="module" />
- <attribute name="revision" />
- <sequential>
- <install-module organisation="@{organisation}" module="@{module}" revision="@{revision}" />
- </sequential>
- </macrodef>
-
- <target name="populate-jar-repo" description="fetch plugins and buildtypes from online repository and prepare them to be shipped within easyant">
- <ea:configure-build-scoped-repository target="${basedir}/target/main/classes/" generateWrapperResoler="false" name="core" settingsRef="easyant.ivy.instance" />
-
- <install-plugin module="abstract-.*" revision="0.9" />
- <install-plugin module="antcontrib-activator" revision="0.9" />
- <install-plugin module="antunit" revision="0.9" />
- <install-plugin module="build-tools" revision="0.9" />
- <install-plugin module="clean-std" revision="0.9" />
- <install-plugin module="compile-java" revision="0.9" />
- <install-plugin module="compile-test-java" revision="0.9" />
- <install-plugin module="default-version-strategy" revision="0.9" />
- <install-plugin module="deps-lib" revision="0.9" />
- <install-plugin module="distribution" revision="0.9" />
- <install-plugin module="documentation" revision="0.9" />
- <install-plugin module="easyant-plugin-publication" revision="0.9" />
- <install-plugin module="ivy-.*" revision="0.9" />
- <install-plugin module="javadoc" revision="0.9" />
- <install-plugin module="manifest" revision="0.9" />
- <install-plugin module="offline" revision="0.9" />
- <install-plugin module="phases-std" revision="0.9" />
- <install-plugin module="resources-std" revision="0.9" />
- <install-plugin module="run-java" revision="0.9" />
- <install-plugin module="skeleton" revision="0.9" />
- <install-plugin module="source-jar" revision="0.9" />
- <install-plugin module="test-junit" revision="0.9" />
-
- <install-buildtype module="build-std-java" revision="0.9" />
- <install-buildtype module="build-std-ant-plugin" revision="0.9" />
- <install-buildtype module="build-webapp-java" revision="0.9" />
- <install-buildtype module="meta-build" revision="0.9" />
- </target>
+ <mkdir dir="${target.dist}/lib/" />
+ <copy todir="${target.dist}/lib">
+ <fileset dir="${basedir}/lib/main" />
+ </copy>
+ <copy file="${target.main.artifact}" todir="${target.dist}/lib" />
+
+ <!-- makes easyant scripts executable -->
+ <chmod perm="744" dir="${target.dist}">
+ <patternset refid="easyant-exec.patternset" />
+ </chmod>
+
+ </target>
+
+ <target name="dist" depends="package-jar:jar, stage-dist" description="update the dist directory (used for development)">
+
+ <!-- declare distribution fileset for use in packaging targets -->
+ <fileset id="easyant-dist.fileset" dir="${target.dist}">
+ <patternset refid="easyant-files.patternset" />
+ <patternset refid="easyant-exec.patternset" />
+ </fileset>
+
+ </target>
+
+ <!-- Create a zip for the binary distribution -->
+ <target name="package-bin-distribution" depends="distribution:init, populate-jar-repo, dist, xooki:generate" description="package the binary distribution" extensionOf="distribution">
+ <echo message="Packaging binary distribution." />
+ <property name="root.dir" value="${ivy.module}-${ivy.revision}" />
+ <bundle destfile="${target.distributions}/${ivy.module}-${version}-bin">
+ <zipfileset dir="${target.dist}" prefix="${root.dir}">
+ <patternset refid="easyant-files.patternset" />
+ </zipfileset>
+ <!-- make scripts executable -->
+ <zipfileset dir="${target.dist}" prefix="${root.dir}" filemode="744">
+ <patternset refid="easyant-exec.patternset" />
+ </zipfileset>
+ <!-- ship the documentation -->
+ <zipfileset dir="${target.documentation.dir}" prefix="${root.dir}/doc" />
+ </bundle>
+
+ </target>
+
+ <!-- Create a zip for the source distribution -->
+ <target name="package-src-distribution" depends="distribution:init" description="package the sources" extensionOf="distribution">
+ <echo message="Packaging source distribution." />
+ <property name="full.root.dir" value="${ivy.module}-${ivy.revision}-src" />
+ <bundle destfile="${target.distributions}/${ivy.module}-${version}-src">
+ <zipfileset dir="${basedir}" prefix="${full.root.dir}">
+ <patternset>
+ <include name="src/**"/>
+ <include name="bin/**"/>
+ <include name="example/**"/>
+ <include name="module.ant"/>
+ <include name="module.ivy"/>
+ <include name="build.xml"/>
+ <include name="easyant-conf.xml"/>
+ <include name="ivysettings.xml"/>
+ <include name="ivysettings-bootstrap.xml"/>
+ <include name="sample-easyant-ivysettings.xml"/>
+ <include name="NOTICE"/>
+ <include name="README"/>
+ <include name="LICENSE"/>
+ <include name=".settings/**"/>
+ <include name=".project"/>
+ <include name=".classpath"/>
+ </patternset>
+ </zipfileset>
+ </bundle>
+ </target>
+
+ <macrodef name="install-module">
+ <attribute name="organisation" />
+ <attribute name="module" />
+ <attribute name="revision" />
+ <sequential>
+ <ivy:install matcher="exactOrRegexp" from="apache-easyant-plugins" to="core" organisation="@{organisation}" module="@{module}" revision="@{revision}" settingsRef="easyant.ivy.instance" overwrite="true" />
+ </sequential>
+ </macrodef>
+
+ <macrodef name="install-buildtype">
+ <attribute name="organisation" default="org.apache.easyant.buildtypes" />
+ <attribute name="module" />
+ <attribute name="revision" />
+ <sequential>
+ <install-module organisation="@{organisation}" module="@{module}" revision="@{revision}" />
+ </sequential>
+ </macrodef>
+
+ <macrodef name="install-plugin">
+ <attribute name="organisation" default="org.apache.easyant.plugins" />
+ <attribute name="module" />
+ <attribute name="revision" />
+ <sequential>
+ <install-module organisation="@{organisation}" module="@{module}" revision="@{revision}" />
+ </sequential>
+ </macrodef>
+
+ <macrodef name="install-skeleton">
+ <attribute name="organisation" default="org.apache.easyant.skeletons" />
+ <attribute name="module" />
+ <attribute name="revision" />
+ <sequential>
+ <install-module organisation="@{organisation}" module="@{module}" revision="@{revision}" />
+ </sequential>
+ </macrodef>
+
+ <target name="populate-jar-repo" description="fetch plugins and buildtypes from online repository and prepare them to be shipped within easyant">
+ <ea:configure-build-scoped-repository target="${basedir}/target/main/classes/" generateWrapperResoler="false" name="core" settingsRef="easyant.ivy.instance" />
+
+ <install-plugin module="abstract-.*" revision="0.9" />
+ <install-plugin module="antcontrib-activator" revision="0.9" />
+ <install-plugin module="antunit" revision="0.9" />
+ <install-plugin module="build-tools" revision="0.9" />
+ <install-plugin module="clean-std" revision="0.9" />
+ <install-plugin module="compile-java" revision="0.9" />
+ <install-plugin module="compile-test-java" revision="0.9" />
+ <install-plugin module="default-version-strategy" revision="0.9" />
+ <install-plugin module="deps-lib" revision="0.9" />
+ <install-plugin module="distribution" revision="0.9" />
+ <install-plugin module="documentation" revision="0.9" />
+ <install-plugin module="easyant-plugin-publication" revision="0.9" />
+ <install-plugin module="ivy-.*" revision="0.9" />
+ <install-plugin module="javadoc" revision="0.9" />
+ <install-plugin module="manifest" revision="0.9" />
+ <install-plugin module="offline" revision="0.9" />
+ <install-plugin module="phases-std" revision="0.9" />
+ <install-plugin module="resources-std" revision="0.9" />
+ <install-plugin module="run-java" revision="0.9" />
+ <install-plugin module="skeleton" revision="0.9" />
+ <install-plugin module="source-jar" revision="0.9" />
+ <install-plugin module="test-junit" revision="0.9" />
+
+ <install-buildtype module="build-std-java" revision="0.9" />
+ <install-buildtype module="build-std-ant-plugin" revision="0.9" />
+ <install-buildtype module="build-webapp-java" revision="0.9" />
+ <install-buildtype module="meta-build" revision="0.9" />
+ </target>
</project>
Modified: incubator/easyant/core/trunk/src/documentation/images/defaultLifecycle.graphml
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/documentation/images/defaultLifecycle.graphml?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/documentation/images/defaultLifecycle.graphml (original)
+++ incubator/easyant/core/trunk/src/documentation/images/defaultLifecycle.graphml Fri Dec 28 14:41:15 2012
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ 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.
+-->
<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
<!--Created by yFiles for Java 2.9-->
<key for="graphml" id="d0" yfiles.type="resources"/>
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ExecutionStatus.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ExecutionStatus.java?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ExecutionStatus.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/core/ant/ExecutionStatus.java Fri Dec 28 14:41:15 2012
@@ -1,3 +1,20 @@
+/*
+ * 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.easyant.core.ant;
public enum ExecutionStatus {
Modified: incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java (original)
+++ incubator/easyant/core/trunk/src/main/java/org/apache/easyant/tasks/AbstractImport.java Fri Dec 28 14:41:15 2012
@@ -1,3 +1,20 @@
+/*
+ * 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.easyant.tasks;
import java.io.File;
Modified: incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java
URL: http://svn.apache.org/viewvc/incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java?rev=1426523&r1=1426522&r2=1426523&view=diff
==============================================================================
--- incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java (original)
+++ incubator/easyant/core/trunk/src/test/java/org/apache/easyant/core/ant/ModuleIvyProjectHelperTest.java Fri Dec 28 14:41:15 2012
@@ -1,3 +1,20 @@
+/*
+ * 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.easyant.core.ant;
import java.io.File;