[jboss-cvs] jboss-seam-tools/src/org/jboss/seam/tools/output/wtp ...

Thomas Heute theute at jboss.com
Thu Aug 10 08:55:20 EDT 2006


  User: theute  
  Date: 06/08/10 08:55:20

  Modified:    src/org/jboss/seam/tools/output/wtp    WTPWebProject.java
                        WTPEarProject.java WTPEjbProject.java
  Log:
  Use resource classloading instead of simple directories
  
  Revision  Changes    Path
  1.3       +8 -8      jboss-seam-tools/src/org/jboss/seam/tools/output/wtp/WTPWebProject.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WTPWebProject.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/wtp/WTPWebProject.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- WTPWebProject.java	8 Aug 2006 11:33:14 -0000	1.2
  +++ WTPWebProject.java	10 Aug 2006 12:55:20 -0000	1.3
  @@ -37,7 +37,7 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version <tt>$Revision: 1.2 $</tt>
  + * @version <tt>$Revision: 1.3 $</tt>
    */
   public class WTPWebProject extends WebProject {
   	
  @@ -76,17 +76,17 @@
   			copyLibs(context);
   		}
   		
  -		Configuration cfg = ConfigurationFactory.getConfiguration();
  +		Configuration cfg = ConfigurationFactory.getConfiguration("web");
   		
   		String outputLocation = getWebContext().getOutputLocation();
   		
   		// Process .classpath
   		File file = new File(outputLocation + File.separatorChar + ".classpath");
  -		TemplateProcessor.process(cfg, "web/eclipse.classpath.ftl", webHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.classpath.ftl", webHash, file);
   		
   		// Process .project
   		file = new File(outputLocation + File.separatorChar + ".project");
  -		TemplateProcessor.process(cfg, "web/eclipse.project.ftl", webHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.project.ftl", webHash, file);
   		
   		// Create .settings directory
   		String settingsDirectoryPath = outputLocation + File.separatorChar + ".settings";
  @@ -95,19 +95,19 @@
   		
   		// Process .settings/.component
   		file = new File(settingsDirectoryPath + File.separatorChar + ".component");
  -		TemplateProcessor.process(cfg, "web/eclipse.component.ftl", webHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.component.ftl", webHash, file);
   		
   		// Process .settings/org.eclipse.jdt.core.prefs
   		file = new File(settingsDirectoryPath + File.separatorChar + "org.eclipse.jdt.core.prefs");
  -		TemplateProcessor.process(cfg, "web/org.eclipse.jdt.core.prefs.ftl", webHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.jdt.core.prefs.ftl", webHash, file);
   		
   		// Process .settings/org.eclipse.jst.common.project.facet.core.prefs
   		file = new File(settingsDirectoryPath + File.separatorChar + "org.eclipse.jst.common.project.facet.core.prefs");
  -		TemplateProcessor.process(cfg, "web/org.eclipse.jst.common.project.facet.core.prefs.ftl", webHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.jst.common.project.facet.core.prefs.ftl", webHash, file);
   		
   		// Process .settings/org.eclipse.wst.common.project.facet.core.xml
   		file = new File(settingsDirectoryPath + File.separatorChar + "org.eclipse.wst.common.project.facet.core.xml");
  -		TemplateProcessor.process(cfg, "web/org.eclipse.wst.common.project.facet.core.xml.ftl", webHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.wst.common.project.facet.core.xml.ftl", webHash, file);
   		
   	}
   	
  
  
  
  1.3       +7 -7      jboss-seam-tools/src/org/jboss/seam/tools/output/wtp/WTPEarProject.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WTPEarProject.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/wtp/WTPEarProject.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- WTPEarProject.java	8 Aug 2006 11:33:14 -0000	1.2
  +++ WTPEarProject.java	10 Aug 2006 12:55:20 -0000	1.3
  @@ -37,7 +37,7 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version <tt>$Revision: 1.2 $</tt>
  + * @version <tt>$Revision: 1.3 $</tt>
    */
   public class WTPEarProject extends EarProject {
   	
  @@ -58,23 +58,23 @@
   		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/application.xml
   		File file = new File(metainfDirectory + File.separatorChar + "application.xml");
  -		TemplateProcessor.process(cfg, "ear/application.xml.ftl", earHash, file);
  +		TemplateProcessor.process(cfg, "application.xml.ftl", earHash, file);
   		
   		// Process WebContent/META-INF/jboss-app.xml
   		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);
   		
   		copyLibs(context);
   		
   		// Process .project
   		file = new File(outputDirectoryPath + File.separatorChar + ".project");
  -		TemplateProcessor.process(cfg, "ear/eclipse.project.ftl", earHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.project.ftl", earHash, file);
   		
   		// Create directory .settings
   		String settingsDirectory = outputDirectoryPath + File.separatorChar + ".settings";
  @@ -83,11 +83,11 @@
   		
   		// Process .settings/.component
   		file = new File(settingsDirectory + File.separatorChar + ".component");
  -		TemplateProcessor.process(cfg, "ear/eclipse.component.ftl", earHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.component.ftl", earHash, file);
   		
   		// Process .settings/jst facet
   		file = new File(settingsDirectory + File.separatorChar + "org.eclipse.wst.common.project.facet.core.xml");
  -		TemplateProcessor.process(cfg, "ear/org.eclipse.wst.common.project.facet.core.xml.ftl", earHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.wst.common.project.facet.core.xml.ftl", earHash, file);
   		
   		
   	}
  
  
  
  1.5       +8 -8      jboss-seam-tools/src/org/jboss/seam/tools/output/wtp/WTPEjbProject.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WTPEjbProject.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/org/jboss/seam/tools/output/wtp/WTPEjbProject.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- WTPEjbProject.java	9 Aug 2006 08:43:26 -0000	1.4
  +++ WTPEjbProject.java	10 Aug 2006 12:55:20 -0000	1.5
  @@ -37,7 +37,7 @@
   
   /**
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version <tt>$Revision: 1.4 $</tt>
  + * @version <tt>$Revision: 1.5 $</tt>
    */
   public class WTPEjbProject extends EjbProject {
   	
  @@ -84,12 +84,12 @@
   		copyLibs(context);
   		
   		
  -		Configuration cfg = ConfigurationFactory.getConfiguration();
  +		Configuration cfg = ConfigurationFactory.getConfiguration("ejb");
   		
   		// Eclipse files
   		// Process .project
   		File file = new File(outputLocation + File.separatorChar + ".project");
  -		TemplateProcessor.process(cfg, "ejb/eclipse.project.ftl", ejbHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.project.ftl", ejbHash, file);
   		
   		// Create .settings directory
   		String settingsDirectoryPath = outputLocation + File.separatorChar + ".settings";
  @@ -98,23 +98,23 @@
   		
   		// Process .classpath
   		file = new File(outputLocation + File.separatorChar + ".classpath");
  -		TemplateProcessor.process(cfg, "ejb/eclipse.classpath.ftl", ejbHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.classpath.ftl", ejbHash, file);
   		
   		// Process .settings/.component
   		file = new File(settingsDirectoryPath + File.separatorChar + ".component");
  -		TemplateProcessor.process(cfg, "ejb/eclipse.component.ftl", ejbHash, file);
  +		TemplateProcessor.process(cfg, "eclipse.component.ftl", ejbHash, file);
   		
   		// Process .settings/org.eclipse.jdt.core.prefs
   		file = new File(settingsDirectoryPath + File.separatorChar + "org.eclipse.jdt.core.prefs");
  -		TemplateProcessor.process(cfg, "ejb/org.eclipse.jdt.core.prefs.ftl", ejbHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.jdt.core.prefs.ftl", ejbHash, file);
   		
   		// Process .settings/org.eclipse.jst.common.project.facet.core.prefs
   		file = new File(settingsDirectoryPath + File.separatorChar + "org.eclipse.jst.common.project.facet.core.prefs");
  -		TemplateProcessor.process(cfg, "ejb/org.eclipse.jst.common.project.facet.core.prefs.ftl", ejbHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.jst.common.project.facet.core.prefs.ftl", ejbHash, file);
   		
   		// Process .settings/org.eclipse.wst.common.project.facet.core.xml
   		file = new File(settingsDirectoryPath + File.separatorChar + "org.eclipse.wst.common.project.facet.core.xml");
  -		TemplateProcessor.process(cfg, "ejb/org.eclipse.wst.common.project.facet.core.xml.ftl", ejbHash, file);
  +		TemplateProcessor.process(cfg, "org.eclipse.wst.common.project.facet.core.xml.ftl", ejbHash, file);
   	}
   
   	private void copyLibs(Context context) throws GenerationException
  
  
  



More information about the jboss-cvs-commits mailing list