Author: dazarov
Date: 2010-04-16 05:53:35 -0400 (Fri, 16 Apr 2010)
New Revision: 21519
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6191
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2010-04-16
08:47:06 UTC (rev 21518)
+++
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2010-04-16
09:53:35 UTC (rev 21519)
@@ -131,12 +131,14 @@
File[] firstlibs = includeLibs.getDir().listFiles(new
AntCopyUtils.FileSetFileFilter(includeLibs));
File[] secondLibs = secondSetincludeLibs.getDir().listFiles(new
AntCopyUtils.FileSetFileFilter(secondSetincludeLibs));
Set<String> allLibs = new HashSet<String>(); // HACK: needed to be unique
because some jboss-*.jars are duplicated
- for(File f : firstlibs) {
- allLibs.add(f.getName());
- }
- for(File f : secondLibs) {
- allLibs.add(f.getName());
- }
+ if(firstlibs != null)
+ for(File f : firstlibs) {
+ allLibs.add(f.getName());
+ }
+ if(secondLibs != null)
+ for(File f : secondLibs) {
+ allLibs.add(f.getName());
+ }
StringBuffer testLibraries = new StringBuffer();
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java
===================================================================
---
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java 2010-04-16
08:47:06 UTC (rev 21518)
+++
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamCreateTestProjectTest.java 2010-04-16
09:53:35 UTC (rev 21519)
@@ -34,6 +34,9 @@
// set property to create test project
model.setProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING, new
Boolean(createTestProject));
+ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
name+"-test");
+ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_EAR_PROJECT,
name+"-ear");
+ model.setStringProperty(ISeamFacetDataModelProperties.SEAM_EJB_PROJECT,
name+"-ejb");
model.setStringProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_NAME, seamVersion);