[jboss-cvs] jboss-seam-tools/src/java/org/jboss/seam/tools/exporter ...

Thomas Heute theute at jboss.com
Tue Aug 29 09:05:47 EDT 2006


  User: theute  
  Date: 06/08/29 09:05:47

  Modified:    src/java/org/jboss/seam/tools/exporter      
                        AbstractSeamExporter.java EjbProjectExporter.java
                        WebProjectExporter.java EarProjectExporter.java
                        AbstractContext.java WebinfExporter.java
  Log:
  re-formatted with headers
  
  Revision  Changes    Path
  1.2       +37 -31    jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/AbstractSeamExporter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamExporter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/AbstractSeamExporter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractSeamExporter.java	14 Aug 2006 15:57:43 -0000	1.1
  +++ AbstractSeamExporter.java	29 Aug 2006 13:05:47 -0000	1.2
  @@ -26,9 +26,15 @@
   import org.hibernate.tool.hbm2x.AbstractExporter;
   import org.hibernate.tool.hbm2x.GenericExporter;
   
  -public abstract class AbstractSeamExporter extends AbstractExporter {
  +/**
  + * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  + * @version <tt>$Revision: 1.2 $</tt>
  + */
  +public abstract class AbstractSeamExporter extends AbstractExporter
  +{
   
  -	protected GenericExporter configureExporter(String template, String pattern) {
  +   protected GenericExporter configureExporter(String template, String pattern)
  +   {
   		GenericExporter exporter = new GenericExporter();
   		exporter.setOutputDirectory(getOutputDirectory());
   		exporter.setProperties((Properties) getProperties().clone());
  
  
  
  1.2       +150 -124  jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/EjbProjectExporter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EjbProjectExporter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/EjbProjectExporter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EjbProjectExporter.java	14 Aug 2006 15:57:43 -0000	1.1
  +++ EjbProjectExporter.java	29 Aug 2006 13:05:47 -0000	1.2
  @@ -28,7 +28,12 @@
   import org.jboss.seam.tools.context.Context;
   import org.jboss.seam.tools.context.EjbContext;
   
  -public class EjbProjectExporter extends AbstractSeamExporter {
  +/**
  + * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  + * @version <tt>$Revision: 1.2 $</tt>
  + */
  +public class EjbProjectExporter extends AbstractSeamExporter
  +{
   
   	private EjbContext ejbContext;
   	
  @@ -45,31 +50,43 @@
   	public void doStart()
   	{
   		configureExporter("ejb/ejb-jar.xml.ftl", ejbContext.getContentDirectory() + "/META-INF/ejb-jar.xml").start();
  -		configureExporter("ejb/persistence.xml.ftl", ejbContext.getContentDirectory() + "/META-INF/persistence.xml").start();
  +      configureExporter("ejb/persistence.xml.ftl", ejbContext.getContentDirectory() + "/META-INF/persistence.xml")
  +            .start();
   		configureExporter("ejb/seam.properties.ftl", ejbContext.getContentDirectory() + "/seam.properties").start();
   		
   		if (context.getEclipseSupport())
   		{
   			configureExporter("ejb/eclipse.classpath.ftl", ".classpath").start();
   			configureExporter("ejb/eclipse.project.ftl", ".project").start();
  -			configureExporter("ejb/org.eclipse.wst.common.component.ftl", ".settings/org.eclipse.wst.common.component").start();
  +         configureExporter("ejb/org.eclipse.wst.common.component.ftl", ".settings/org.eclipse.wst.common.component")
  +               .start();
   			configureExporter("ejb/org.eclipse.jdt.core.prefs.ftl", ".settings/org.eclipse.jdt.core.prefs").start();
  -			configureExporter("ejb/org.eclipse.jst.common.project.facet.core.prefs.ftl", ".settings/org.eclipse.jst.common.project.facet.core.prefs").start();
  -			configureExporter("ejb/org.eclipse.wst.common.project.facet.core.xml.ftl", ".settings/org.eclipse.wst.common.project.facet.core.xml").start();
  +         configureExporter("ejb/org.eclipse.jst.common.project.facet.core.prefs.ftl",
  +               ".settings/org.eclipse.jst.common.project.facet.core.prefs").start();
  +         configureExporter("ejb/org.eclipse.wst.common.project.facet.core.xml.ftl",
  +               ".settings/org.eclipse.wst.common.project.facet.core.xml").start();
   		}
   		
   		if (context.isBasicProject())
   		{
  -			configureExporter("basic/Register.java.ftl", ejbContext.getContentDirectory() + "/" + context.getSrcPackage().replace('.', '/')  + "/Register.java").start();
  -			configureExporter("basic/RegisterAction.java.ftl", ejbContext.getContentDirectory() + "/" + context.getSrcPackage().replace('.', '/')  + "/RegisterAction.java").start();
  -			configureExporter("basic/User.java.ftl", ejbContext.getContentDirectory() + "/" + context.getSrcPackage().replace('.', '/')  + "/User.java").start();
  +         configureExporter("basic/Register.java.ftl",
  +               ejbContext.getContentDirectory() + "/" + context.getSrcPackage().replace('.', '/') + "/Register.java")
  +               .start();
  +         configureExporter(
  +               "basic/RegisterAction.java.ftl",
  +               ejbContext.getContentDirectory() + "/" + context.getSrcPackage().replace('.', '/')
  +                     + "/RegisterAction.java").start();
  +         configureExporter("basic/User.java.ftl",
  +               ejbContext.getContentDirectory() + "/" + context.getSrcPackage().replace('.', '/') + "/User.java")
  +               .start();
   		}
   		
   		if (context.isTestSupport())
   		{
   			configureExporter("test/components.properties.ftl", "conftest/components.properties").start();
   			configureExporter("test/components.xml.ftl", "conftest/components.xml").start();
  -			configureExporter("test/default.persistence.properties.ftl", "conftest/default.persistence.properties").start();
  +         configureExporter("test/default.persistence.properties.ftl", "conftest/default.persistence.properties")
  +               .start();
   			configureExporter("test/ejb3-interceptors-aop.xml.ftl", "conftest/ejb3-interceptors-aop.xml").start();
   			configureExporter("test/embedded-jboss-beans.xml.ftl", "conftest/embedded-jboss-beans.xml").start();
   			configureExporter("test/jboss-jms-beans.xml.ftl", "conftest/jboss-jms-beans.xml").start();
  @@ -97,10 +114,14 @@
   	private void copyLib(Context context, String libName)
   	{
   		File src = new File(context.getSeamLocation() + File.separatorChar + "lib" + File.separatorChar + libName);
  -		File dst = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + "lib" + File.separatorChar + libName);
  -		try {
  +      File dst = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + "lib" + File.separatorChar
  +            + libName);
  +      try
  +      {
   			Util.copy(src, dst);
  -		} catch (IOException e) {
  +      }
  +      catch (IOException e)
  +      {
   			e.printStackTrace();
   		}
   	}
  @@ -113,23 +134,28 @@
   		super.setupContext();
   	}
   	
  -    private void init() {
  +   private void init()
  +   {
       	setTemplatePrefix("ejb/");		
   	}
   
  -	public EjbContext getEjbContext() {
  +   public EjbContext getEjbContext()
  +   {
   		return ejbContext;
   	}
   
  -	public void setEjbContext(EjbContext ejbContext) {
  +   public void setEjbContext(EjbContext ejbContext)
  +   {
   		this.ejbContext = ejbContext;
   	}
   
  -	public Object getEarContext() {
  +   public Object getEarContext()
  +   {
   		return earContext;
   	}
   
  -	public void setEarContext(Object earContext) {
  +   public void setEarContext(Object earContext)
  +   {
   		this.earContext = earContext;
   	}
   	
  
  
  
  1.2       +105 -86   jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/WebProjectExporter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebProjectExporter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/WebProjectExporter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- WebProjectExporter.java	14 Aug 2006 15:57:43 -0000	1.1
  +++ WebProjectExporter.java	29 Aug 2006 13:05:47 -0000	1.2
  @@ -27,10 +27,17 @@
   import org.jboss.seam.tools.context.EarContext;
   import org.jboss.seam.tools.context.WebContext;
   
  -public class WebProjectExporter extends AbstractSeamExporter {
  +/**
  + * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  + * @version <tt>$Revision: 1.2 $</tt>
  + */
  +public class WebProjectExporter extends AbstractSeamExporter
  +{
   
   	private EarContext earContext;
  +
   	private WebContext webContext;
  +
   	private Context context;
   	
   	public WebProjectExporter(Context context)
  @@ -41,7 +48,9 @@
   	
   	public void doStart()
   	{
  -		WebinfExporter webinfExporter = new WebinfExporter(new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + webContext.getContentDirectory() + File.separatorChar + "WEB-INF"), context, webContext);
  +      WebinfExporter webinfExporter = new WebinfExporter(new File(getOutputDirectory().getAbsolutePath()
  +            + File.separatorChar + webContext.getContentDirectory() + File.separatorChar + "WEB-INF"), context,
  +            webContext);
   		webinfExporter.setEarContext(earContext);
   		webinfExporter.start();
   		
  @@ -49,17 +58,22 @@
   		{
   			configureExporter("web/eclipse.classpath.ftl", ".classpath").start();
   			configureExporter("web/eclipse.project.ftl", ".project").start();
  -			configureExporter("web/org.eclipse.wst.common.component.ftl", ".settings/org.eclipse.wst.common.component").start();
  +         configureExporter("web/org.eclipse.wst.common.component.ftl", ".settings/org.eclipse.wst.common.component")
  +               .start();
   			configureExporter("web/org.eclipse.jdt.core.prefs.ftl", ".settings/org.eclipse.jdt.core.prefs").start();
  -			configureExporter("web/org.eclipse.jst.common.project.facet.core.prefs.ftl", ".settings/org.eclipse.jst.common.project.facet.core.prefs").start();
  -			configureExporter("web/org.eclipse.wst.common.project.facet.core.xml.ftl", ".settings/org.eclipse.wst.common.project.facet.core.xml").start();
  +         configureExporter("web/org.eclipse.jst.common.project.facet.core.prefs.ftl",
  +               ".settings/org.eclipse.jst.common.project.facet.core.prefs").start();
  +         configureExporter("web/org.eclipse.wst.common.project.facet.core.xml.ftl",
  +               ".settings/org.eclipse.wst.common.project.facet.core.xml").start();
   		}
   		
   		if (context.isBasicProject())
   		{
   			configureExporter("basic/index.html.ftl", webContext.getContentDirectory() + "/index.html").start();
  -			configureExporter("basic/register.jsp.ftl", webContext.getContentDirectory() + "/register." + webContext.getJsfExtension()).start();
  -			configureExporter("basic/registered.jsp.ftl", webContext.getContentDirectory() + "/registered." + webContext.getJsfExtension()).start();
  +         configureExporter("basic/register.jsp.ftl",
  +               webContext.getContentDirectory() + "/register." + webContext.getJsfExtension()).start();
  +         configureExporter("basic/registered.jsp.ftl",
  +               webContext.getContentDirectory() + "/registered." + webContext.getJsfExtension()).start();
   		}
   		
   		File file = new File(getOutputDirectory(), "src");
  @@ -74,23 +88,28 @@
   		super.setupContext();
   	}
   	
  -    private void init() {
  +   private void init()
  +   {
       	setTemplatePrefix("web/");		
   	}
   
  -	public WebContext getWebContext() {
  +   public WebContext getWebContext()
  +   {
   		return webContext;
   	}
   
  -	public void setWebContext(WebContext webContext) {
  +   public void setWebContext(WebContext webContext)
  +   {
   		this.webContext = webContext;
   	}
   
  -	public EarContext getEarContext() {
  +   public EarContext getEarContext()
  +   {
   		return earContext;
   	}
   
  -	public void setEarContext(EarContext earContext) {
  +   public void setEarContext(EarContext earContext)
  +   {
   		this.earContext = earContext;
   	}
   
  
  
  
  1.2       +143 -128  jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/EarProjectExporter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EarProjectExporter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/EarProjectExporter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EarProjectExporter.java	14 Aug 2006 15:57:43 -0000	1.1
  +++ EarProjectExporter.java	29 Aug 2006 13:05:47 -0000	1.2
  @@ -33,7 +33,12 @@
   import org.jboss.seam.tools.context.EjbContext;
   import org.jboss.seam.tools.context.WebContext;
   
  -public class EarProjectExporter extends AbstractSeamExporter {
  +/**
  + * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  + * @version <tt>$Revision: 1.2 $</tt>
  + */
  +public class EarProjectExporter extends AbstractSeamExporter
  +{
   
   	private EarContext earContext;
   	
  @@ -62,7 +67,6 @@
   		getProperties().put("ejbContexts", ejbContexts);
   		getProperties().put("context", context);
   		
  -		
   		/*
   		getProperties().put("projectName", earContext.getProjectName());
   		getProperties().put("displayName", earContext.getDisplayName());
  @@ -78,37 +82,48 @@
   	
   	public void doStart()
   	{
  -		configureExporter("ear/application.xml.ftl", earContext.getContentDirectory() + "/META-INF/application.xml").start();
  +      configureExporter("ear/application.xml.ftl", earContext.getContentDirectory() + "/META-INF/application.xml")
  +            .start();
   		configureExporter("ear/jboss-app.xml.ftl", earContext.getContentDirectory() + "/META-INF/jboss-app.xml").start();
   		
   		if (context.getEclipseSupport())
   		{
   			configureExporter("ear/eclipse.project.ftl", ".project").start();
  -			configureExporter("ear/org.eclipse.wst.common.component.ftl", ".settings/org.eclipse.wst.common.component").start();
  -			configureExporter("ear/org.eclipse.wst.common.project.facet.core.xml.ftl", ".settings/org.eclipse.wst.common.project.facet.core.xml").start();
  +         configureExporter("ear/org.eclipse.wst.common.component.ftl", ".settings/org.eclipse.wst.common.component")
  +               .start();
  +         configureExporter("ear/org.eclipse.wst.common.project.facet.core.xml.ftl",
  +               ".settings/org.eclipse.wst.common.project.facet.core.xml").start();
   		}
   		
   		// TODO: nice way of copying files...
  -		File file = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + getEarContext().getContentDirectory());
  +      File file = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar
  +            + getEarContext().getContentDirectory());
   		file.mkdirs();
   		File src = new File(context.getSeamLocation() + File.separatorChar + "jboss-seam.jar");
  -		File dst = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + getEarContext().getContentDirectory() + File.separatorChar + "jboss-seam.jar");
  -		try {
  +      File dst = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar
  +            + getEarContext().getContentDirectory() + File.separatorChar + "jboss-seam.jar");
  +      try
  +      {
   			Util.copy(src, dst);
  -		} catch (IOException e) {
  +      }
  +      catch (IOException e)
  +      {
   			e.printStackTrace();
   		}
   	}
   	
  -    private void init() {
  +   private void init()
  +   {
       	setTemplatePrefix("web/");		
   	}
   
  -	public EarContext getEarContext() {
  +   public EarContext getEarContext()
  +   {
   		return earContext;
   	}
   
  -	public void setEarContext(EarContext earContext) {
  +   public void setEarContext(EarContext earContext)
  +   {
   		this.earContext = earContext;
   	}
   	
  
  
  
  1.2       +32 -27    jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/AbstractContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/AbstractContext.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractContext.java	14 Aug 2006 15:57:43 -0000	1.1
  +++ AbstractContext.java	29 Aug 2006 13:05:47 -0000	1.2
  @@ -23,7 +23,12 @@
   
   import java.util.Map;
   
  -public abstract class AbstractContext {
  +/**
  + * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  + * @version <tt>$Revision: 1.2 $</tt>
  + */
  +public abstract class AbstractContext
  +{
   
   	protected Map map;
   
  
  
  
  1.2       +113 -100  jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/WebinfExporter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebinfExporter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam-tools/src/java/org/jboss/seam/tools/exporter/WebinfExporter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- WebinfExporter.java	14 Aug 2006 15:57:43 -0000	1.1
  +++ WebinfExporter.java	29 Aug 2006 13:05:47 -0000	1.2
  @@ -32,11 +32,17 @@
   import org.jboss.seam.tools.context.EarContext;
   import org.jboss.seam.tools.context.WebContext;
   
  -public class WebinfExporter extends AbstractExporter {
  +/**
  + * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  + * @version <tt>$Revision: 1.2 $</tt>
  + */
  +public class WebinfExporter extends AbstractExporter
  +{
   
   	private EarContext earContext;
   	
   	private Context context;
  +
   	private WebContext webContext;
   	
   	public WebinfExporter(File outputDirectory, Context context, WebContext webContext)
  @@ -57,13 +63,13 @@
   		File file = new File(getOutputDirectory(), "lib");
   		file.mkdirs();
   		
  -		
   		File seamLocation = new File(context.getSeamLocation());
   		copyLib(seamLocation, "jboss-seam-ui.jar");
   		if (context.isFaceletsSupport() | context.isDebug())
   		{
   			copyLib(seamLocation, "jboss-seam-debug.jar");
  -			File faceletsLocation = new File(context.getSeamLocation() + File.separatorChar + "facelets" + File.separatorChar + "lib");
  +         File faceletsLocation = new File(context.getSeamLocation() + File.separatorChar + "facelets"
  +               + File.separatorChar + "lib");
   			copyLib(faceletsLocation, "jsf-facelets.jar");
   			copyLib(faceletsLocation, "el-api.jar");
   			copyLib(faceletsLocation, "el-ri.jar");
  @@ -73,10 +79,14 @@
   	private void copyLib(File sourceDirectory, String libName)
   	{
   		File src = new File(sourceDirectory, libName);
  -		File dst = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + "lib" + File.separatorChar + libName);
  -		try {
  +      File dst = new File(getOutputDirectory().getAbsolutePath() + File.separatorChar + "lib" + File.separatorChar
  +            + libName);
  +      try
  +      {
   			Util.copy(src, dst);
  -		} catch (IOException e) {
  +      }
  +      catch (IOException e)
  +      {
   			e.printStackTrace();
   		}
   	}
  @@ -89,11 +99,13 @@
   		super.setupContext();
   	}
   	
  -	private void init() {
  +   private void init()
  +   {
       	setTemplatePrefix("web/");		
   	}
   	
  -	private GenericExporter configureExporter(String template, String pattern) {
  +   private GenericExporter configureExporter(String template, String pattern)
  +   {
   		GenericExporter exporter = new GenericExporter();
   		exporter.setOutputDirectory(getOutputDirectory());
   		exporter.setProperties((Properties) getProperties().clone());
  @@ -104,12 +116,13 @@
   		return exporter;
   	}
   	
  -
  -	public EarContext getEarContext() {
  +   public EarContext getEarContext()
  +   {
   		return earContext;
   	}
   
  -	public void setEarContext(EarContext earContext) {
  +   public void setEarContext(EarContext earContext)
  +   {
   		this.earContext = earContext;
   	}
   
  
  
  



More information about the jboss-cvs-commits mailing list