[jboss-cvs] jboss-seam-tools/src/org/jboss/seam/tools/output/maven ...
Thomas Heute
theute at jboss.com
Thu Aug 10 08:55:18 EDT 2006
User: theute
Date: 06/08/10 08:55:18
Modified: src/org/jboss/seam/tools/output/maven
MavenWebProject.java MavenRootProject.java
MavenEarProject.java MavenEjbProject.java
Log:
Use resource classloading instead of simple directories
Revision Changes Path
1.2 +4 -4 jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenWebProject.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MavenWebProject.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenWebProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MavenWebProject.java 8 Aug 2006 11:33:12 -0000 1.1
+++ MavenWebProject.java 10 Aug 2006 12:55:18 -0000 1.2
@@ -37,7 +37,7 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
*/
public class MavenWebProject extends WebProject {
@@ -57,8 +57,6 @@
String webappDirectoryPath = outputLocationDirectoryPath + File.separatorChar + "src" + File.separatorChar + "main" + File.separatorChar + "webapp";
Util.createDirectory(webappDirectoryPath);
- Configuration cfg = ConfigurationFactory.getConfiguration();
-
TemplateHashModel webHash = new WebHashModel(this, context);
createWebInf(webappDirectoryPath, webHash);
@@ -70,8 +68,10 @@
copyBasicProject(webappDirectoryPath, webHash, context);
}
+ Configuration cfg = ConfigurationFactory.getConfiguration("web");
+
// Process pom.xml
File file = new File(outputLocation + File.separatorChar + "pom.xml");
- TemplateProcessor.process(cfg, "web/pom.xml.ftl", webHash, file);
+ TemplateProcessor.process(cfg, "pom.xml.ftl", webHash, file);
}
}
1.2 +3 -3 jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenRootProject.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MavenRootProject.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenRootProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MavenRootProject.java 8 Aug 2006 11:33:12 -0000 1.1
+++ MavenRootProject.java 10 Aug 2006 12:55:18 -0000 1.2
@@ -42,7 +42,7 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
*/
public class MavenRootProject extends RootProject {
@@ -52,13 +52,13 @@
String outputDirectoryPath = context.getOutputLocation();
Util.createDirectory(outputDirectoryPath);
- Configuration cfg = ConfigurationFactory.getConfiguration();
+ Configuration cfg = ConfigurationFactory.getConfiguration("other");
TemplateHashModel rootHash = new RootHashModel(this, context);
// Process pom.xml
File file = new File(outputDirectoryPath + File.separatorChar + "pom.xml");
- TemplateProcessor.process(cfg, "other/pom.xml.ftl", rootHash, file);
+ TemplateProcessor.process(cfg, "pom.xml.ftl", rootHash, file);
String earOuputLocation = outputDirectoryPath + File.separatorChar + earProject.getProjectName();
earProject.getEarContext().setOutputLocation(earOuputLocation);
1.2 +4 -4 jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenEarProject.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MavenEarProject.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenEarProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MavenEarProject.java 8 Aug 2006 11:33:12 -0000 1.1
+++ MavenEarProject.java 10 Aug 2006 12:55:18 -0000 1.2
@@ -35,7 +35,7 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
*/
public class MavenEarProject extends EarProject {
@@ -56,17 +56,17 @@
created = new File(metainfDirectory).mkdirs();
if (!created) throw new GenerationException("Could not create directory: " + metainfDirectory);
- Configuration cfg = ConfigurationFactory.getConfiguration();
+ Configuration cfg = ConfigurationFactory.getConfiguration("ear");
TemplateHashModel earHash = new EarHashModel(this, context);
// Process WebContent/META-INF/jboss-app.xml
File file = new File(metainfDirectory + File.separatorChar + "jboss-app.xml");
- TemplateProcessor.process(cfg, "ear/jboss-app.xml.ftl", earHash, file);
+ TemplateProcessor.process(cfg, "jboss-app.xml.ftl", earHash, file);
// Process pom.xml
file = new File(outputDirectoryPath + File.separatorChar + "pom.xml");
- TemplateProcessor.process(cfg, "ear/pom.xml.ftl", earHash, file);
+ TemplateProcessor.process(cfg, "pom.xml.ftl", earHash, file);
}
1.2 +3 -3 jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenEjbProject.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MavenEjbProject.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/maven/MavenEjbProject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MavenEjbProject.java 8 Aug 2006 11:33:12 -0000 1.1
+++ MavenEjbProject.java 10 Aug 2006 12:55:18 -0000 1.2
@@ -37,7 +37,7 @@
/**
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
- * @version <tt>$Revision: 1.1 $</tt>
+ * @version <tt>$Revision: 1.2 $</tt>
*/
public class MavenEjbProject extends EjbProject {
@@ -91,12 +91,12 @@
createTestSupport(srcTestResourcesDirectoryPath, ejbHash, context);
}
- Configuration cfg = ConfigurationFactory.getConfiguration();
+ Configuration cfg = ConfigurationFactory.getConfiguration("ejb");
// Process pom.xml
File file = new File(outputLocation + File.separatorChar + "pom.xml");
- TemplateProcessor.process(cfg, "ejb/pom.xml.ftl", ejbHash, file);
+ TemplateProcessor.process(cfg, "pom.xml.ftl", ejbHash, file);
}
More information about the jboss-cvs-commits
mailing list