jvanzyl 02/03/11 15:43:56
Modified: . project.xml
src/java/org/apache/maven ProjectProperties.java
Reactor.java
src/templates/build Control.vm
xdocs jrcs.xml
Log:
Adding src/dvsl contents to the distributed JAR so I can pull out
those files when creating the generated build.
Redoing the reactor so it will be in rough shape for a few days but
I plan to use to publish all the turbine projects for the 2.2b1 release.
Revision Changes Path
1.19 +1 -2 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- project.xml 8 Mar 2002 19:33:57 -0000 1.18
+++ project.xml 11 Mar 2002 23:43:56 -0000 1.19
@@ -40,8 +40,6 @@
<url>http://jakarta.apache.org/turbine/maven/</url>
<cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</cvsWebUrl>
- <repository id="jakarta"/>
-
<mailingLists>
<mailingList>
<name>Turbine User List</name>
@@ -264,6 +262,7 @@
<jarResources>
<jarResource>src/templates/**</jarResource>
+ <jarResource>src/dvsl/**</jarResource>
</jarResources>
<jars>
1.6 +5 -5
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProjectProperties.java 5 Mar 2002 04:12:57 -0000 1.5
+++ ProjectProperties.java 11 Mar 2002 23:43:56 -0000 1.6
@@ -47,7 +47,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *2
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
@@ -80,7 +80,7 @@
* the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.5 2002/03/05 04:12:57 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.6 2002/03/11 23:43:56 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -111,7 +111,7 @@
log("Creating run-time test class entries reference ...");
createPatternSetReference("runtime.test.set",
mavenProject.getBuild().getRuntimeTestClassEntries());
-
+
createJarResourcesProperty();
}
@@ -181,7 +181,7 @@
{
// We have a jar descriptor file
includesSb.append(line).append(",");
- }
+ }
}
String includes = includesSb.toString();
@@ -212,9 +212,9 @@
{
getProject().setProperty("jar.resources.present", "true");
}
-
+
createPatternSetReference("jar.resources.set",
mavenProject.getBuild().getJarResources());
-
+
}
}
1.5 +31 -19 jakarta-turbine-maven/src/java/org/apache/maven/Reactor.java
Index: Reactor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/Reactor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Reactor.java 28 Feb 2002 22:41:02 -0000 1.4
+++ Reactor.java 11 Mar 2002 23:43:56 -0000 1.5
@@ -69,9 +69,6 @@
import org.apache.maven.project.Project;
import org.apache.maven.project.Workspace;
-import org.apache.log4j.Category;
-import org.apache.log4j.PropertyConfigurator;
-
import org.apache.velocity.VelocityContext;
import org.apache.velocity.Template;
import org.apache.velocity.runtime.Runtime;
@@ -79,6 +76,7 @@
import org.apache.stratum.xo.Mapper;
import org.apache.commons.graph.Graphable;
+import org.apache.commons.graph.LabeledVertex;
import org.apache.commons.graph.util.DependencyResolver;
import org.apache.maven.executor.AbstractExecutor;
@@ -89,7 +87,7 @@
* command line, servlet ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Reactor.java,v 1.4 2002/02/28 22:41:02 jvanzyl Exp $
+ * @version $Id: Reactor.java,v 1.5 2002/03/11 23:43:56 jvanzyl Exp $
*/
public class Reactor
extends AbstractExecutor
@@ -102,7 +100,7 @@
/**
* Log4j category used for logging.
*/
- private Category category = Category.getInstance(getClass().getName());
+ //private Category category = Category.getInstance(getClass().getName());
/**
* The directory where all the Maven descriptors are stored.
@@ -193,6 +191,8 @@
return javaProject;
}
+ Project ppp;
+
/**
* Execute the the overall maven opertion.
*
@@ -201,11 +201,13 @@
public void execute()
throws Exception
{
+ System.out.println("heelo");
+
// Setup log4j with a standard properties file.
- PropertyConfigurator.configure("log4j.properties");
- checkPrerequisites();
+ //PropertyConfigurator.configure("log4j.properties");
+ //checkPrerequisites();
- category.debug("Workspace file: " + workspace);
+ //category.debug("Workspace file: " + workspace);
// Now the workspace only deals with projects stating
// their direct dependencies so if we have a profile that
@@ -215,10 +217,10 @@
List profiles = mapProjectDescriptors();
DependencyResolver dr = new DependencyResolver();
- if (javaProject.equals("all") == false)
- {
+ //if (javaProject.equals("all") == false)
+ //{
dr.setTraverseAll(false);
- }
+ //}
for (Iterator i = profiles.iterator(); i.hasNext(); )
{
@@ -226,6 +228,8 @@
dr.addGraphable(g, ((Project) g).getDependencies());
}
+ /*
+
// We need special workspace for all the projects
// for the typical gump build.
@@ -241,16 +245,16 @@
// We want to be able to differentiate
Graphable gg = (Graphable) w.getProfile().getProjects().get(1);
- dr.printGraph("graph.xml", (Graphable) gg);
- List deps = dr.getSortedDependencies(gg.getName());
+ */
+ //dr.printGraph("graph.xml", (Graphable) ppp);
+ List deps = dr.getSortedDependencies(ppp.getName());
- category.info("< " + gg.getName() + " >");
-
- for (Iterator i = deps.iterator(); i.hasNext(); )
+ for (Iterator i = deps.iterator(); i.hasNext();)
{
- category.info(i.next());
+ System.out.println(i.next());
}
+ /*
Velocity.init();
VelocityContext context = new VelocityContext();
@@ -267,6 +271,7 @@
Velocity.mergeTemplate("src/templates/build.vm", context, writer);
writer.flush();
writer.close();
+ */
}
/**
@@ -310,17 +315,24 @@
try
{
File project = new File(getDescriptorDir(), "project/" + files[i]);
- category.debug("Processing module -> " + project);
+ //category.debug("Processing module -> " + project);
Project p = (Project) projectMapper.map(
project.toString(), "org.apache.maven.project.Project");
+ if (p.toString().equals("jakarta-turbine-3"))
+ {
+ ppp = p;
+ }
+
+
projects.add(p);
}
catch (Exception e)
{
- category.error("Error processing " + files[i], e);
+ System.out.println(e);
}
}
+
return projects;
}
1.9 +0 -1 jakarta-turbine-maven/src/templates/build/Control.vm
Index: Control.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/templates/build/Control.vm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Control.vm 5 Mar 2002 15:22:27 -0000 1.8
+++ Control.vm 11 Mar 2002 23:43:56 -0000 1.9
@@ -79,4 +79,3 @@
$generator.parse("LICENSE","LICENSE")
$generator.parse("README.txt","README.txt")
-
1.5 +0 -10 jakarta-turbine-maven/xdocs/jrcs.xml
Index: jrcs.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/xdocs/jrcs.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- jrcs.xml 8 Mar 2002 01:21:24 -0000 1.4
+++ jrcs.xml 11 Mar 2002 23:43:56 -0000 1.5
@@ -81,16 +81,6 @@
</td>
</tr>
<tr>
- <td>GNU Regexp</td>
- <td>
- The GNU regexp Java library is used for RCS keyword management.
- You can get a copy of gnu.regexp from <a href=
- "http://www.cacas.org/java/gnu/regexp/";>
- http://www.cacas.org/java/gnu/regexp/</a>. A copy of gnu.regexp
- is included in the full distribution of this library.
- </td>
- </tr>
- <tr>
<td>Ant</td>
<td>
Jakarta Ant is used for building the JRCS library. Ant
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
