JBoss Tools SVN: r34516 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-09-05 03:38:47 -0400 (Mon, 05 Sep 2011)
New Revision: 34516
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
Log:
JBIDE-9650 - critical fix for suspending jmx scanner.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-09-05 06:46:47 UTC (rev 34515)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-09-05 07:38:47 UTC (rev 34516)
@@ -233,7 +233,7 @@
}
protected boolean shouldSuspendScanner() {
- return getServer().getServerState() != IServer.STATE_STARTED
+ return getServer().getServerState() == IServer.STATE_STARTED
&& ExtensionManager.getDefault().getJMXRunner() != null;
}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34515 - branches/jbosstools-3.2.x/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-05 02:46:47 -0400 (Mon, 05 Sep 2011)
New Revision: 34515
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
use only site_assembly.zip as site.zip is useless (only contains metadata, but no features/plugins)
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-09-04 23:53:25 UTC (rev 34514)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-09-05 06:46:47 UTC (rev 34515)
@@ -41,21 +41,12 @@
z=""
if [[ -d ${WORKSPACE}/sources/aggregate/site/target ]]; then
siteZip=${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip
- if [[ ! -f ${WORKSPACE}/sources/aggregate/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip
- fi
z=$siteZip
elif [[ -d ${WORKSPACE}/sources/aggregate/site/site/target ]]; then
siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip
- if [[ ! -f ${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site.zip
- fi
z=$siteZip
elif [[ -d ${WORKSPACE}/sources/site/target ]]; then
siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
- if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
- siteZip=${WORKSPACE}/sources/site/target/site.zip
- fi
z=$siteZip
fi
@@ -113,8 +104,8 @@
fi
z=""
-# if component zips exist, copy them too; first site.zip, then site_assembly.zip
-for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site*.zip" | sort -r); do
+# if component zips exist, copy site_assembly.zip too
+for z in $(find ${WORKSPACE}/sources/*/site/target -type f -name "site_assembly.zip"); do
y=${z%%/site/target/*}; y=${y##*/}
if [[ $y != "aggregate" ]]; then # prevent duplicate nested sites
#echo "[$y] $z ..."
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34514 - in trunk/documentation/jboss-tools-docs: index/en-US and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-04 19:53:25 -0400 (Sun, 04 Sep 2011)
New Revision: 34514
Modified:
trunk/documentation/jboss-tools-docs/all-guides.xml
trunk/documentation/jboss-tools-docs/index/en-US/master.xml
Log:
updated for 2011
Modified: trunk/documentation/jboss-tools-docs/all-guides.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/all-guides.xml 2011-09-04 12:31:07 UTC (rev 34513)
+++ trunk/documentation/jboss-tools-docs/all-guides.xml 2011-09-04 23:53:25 UTC (rev 34514)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+n<?xml version="1.0" encoding="UTF-8"?>
<assembly>
<id>all-guides</id>
Modified: trunk/documentation/jboss-tools-docs/index/en-US/master.xml
===================================================================
--- trunk/documentation/jboss-tools-docs/index/en-US/master.xml 2011-09-04 12:31:07 UTC (rev 34513)
+++ trunk/documentation/jboss-tools-docs/index/en-US/master.xml 2011-09-04 23:53:25 UTC (rev 34514)
@@ -6,8 +6,7 @@
<title>JBoss Tools Guides - Latest Version</title>
<pubdate>Last published: <?dbtimestamp format="B d, Y"?></pubdate>
<copyright>
- <year>2007</year>
- <year>2010</year>
+ <year>2011</year>
<holder>JBoss by Red Hat</holder>
</copyright>
</bookinfo>
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34513 - in trunk/birt/plugins/org.jboss.tools.birt.oda: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-04 08:31:07 -0400 (Sun, 04 Sep 2011)
New Revision: 34513
Modified:
trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
trunk/birt/plugins/org.jboss.tools.birt.oda/build.properties
Log:
JBIDE-9639 using Tycho 0.13.0-SNAPSHOT, cannot resolve hibernate when building birt
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2011-09-04 00:53:28 UTC (rev 34512)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/META-INF/MANIFEST.MF 2011-09-04 12:31:07 UTC (rev 34513)
@@ -13,5 +13,5 @@
org.eclipse.datatools.connectivity.oda;bundle-version="[3.1.0,4.0.0)",
org.eclipse.datatools.connectivity.oda.profile;bundle-version="[3.0.4,4.0.0)",
org.hibernate.eclipse;resolution:=optional
-Eclipse-LazyStart: true
+Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified: trunk/birt/plugins/org.jboss.tools.birt.oda/build.properties
===================================================================
--- trunk/birt/plugins/org.jboss.tools.birt.oda/build.properties 2011-09-04 00:53:28 UTC (rev 34512)
+++ trunk/birt/plugins/org.jboss.tools.birt.oda/build.properties 2011-09-04 12:31:07 UTC (rev 34513)
@@ -4,3 +4,4 @@
META-INF/,\
.,\
plugin.properties
+jars.extra.classpath = platform:/plugin/org.hibernate.eclipse
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34512 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-03 20:53:28 -0400 (Sat, 03 Sep 2011)
New Revision: 34512
Modified:
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java
trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java
Log:
@Override removed, because of compilation problems in maven
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/DecisionDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -100,7 +100,6 @@
final Decision decision = (Decision)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
decision.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/EndStateDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -69,7 +69,6 @@
final EndState endState = (EndState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
endState.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ForkDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -103,7 +103,6 @@
final Fork fork = (Fork)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
fork.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/JoinDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -95,7 +95,6 @@
final Join join = (Join)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
join.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/MailNodeDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -122,7 +122,6 @@
final MailNode mailNode = (MailNode)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
mailNode.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/NodeDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -121,7 +121,6 @@
final Node node = (Node)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
node.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/ProcessStateDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -108,7 +108,6 @@
final ProcessState processState = (ProcessState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
processState.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StartStateDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -84,7 +84,6 @@
final StartState startState = (StartState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
startState.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/StateDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -96,7 +96,6 @@
final State state = (State)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
state.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/SuperStateDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -120,7 +120,6 @@
final SuperState superState = (SuperState)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
superState.setName(newValue);
}
Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java
===================================================================
--- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java 2011-09-03 15:15:13 UTC (rev 34511)
+++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/xml/TaskNodeDomAdapter.java 2011-09-04 00:53:28 UTC (rev 34512)
@@ -115,7 +115,6 @@
final TaskNode taskNode = (TaskNode)getSemanticElement();
if ("name".equals(name)) {
Display.getDefault().asyncExec(new Runnable() {
- @Override
public void run() {
taskNode.setName(newValue);
}
@@ -170,4 +169,4 @@
}
}
-}
\ No newline at end of file
+}
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34511 - trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-03 11:15:13 -0400 (Sat, 03 Sep 2011)
New Revision: 34511
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
Log:
JBIDE-9643 Using default deployment location from JBoss AS Runtime
Modified: trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-09-03 08:28:38 UTC (rev 34510)
+++ trunk/runtime/plugins/org.jboss.tools.runtime.as.detector/src/org/jboss/tools/runtime/handlers/JBossASHandler.java 2011-09-03 15:15:13 UTC (rev 34511)
@@ -16,7 +16,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
-import java.util.Set;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
@@ -46,9 +45,6 @@
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.internal.RuntimeWorkingCopy;
-import org.eclipse.wst.server.core.internal.ServerWorkingCopy;
-import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.bean.JBossServerType;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBean;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
@@ -70,7 +66,6 @@
private static final String ESB = "ESB"; //$NON-NLS-1$
public void initializeRuntimes(List<ServerDefinition> serverDefinitions) {
- // FIXME
//createInitialJBossServer();
createJBossServerFromDefinitions(serverDefinitions);
}
@@ -261,7 +256,8 @@
// IJBossServerRuntime.PROPERTY_VM_TYPE_ID
// ((RuntimeWorkingCopy) runtime).setAttribute("PROPERTY_VM_TYPE_ID", defaultVM.getVMInstallType().getId()); //$NON-NLS-1$
// IJBossServerRuntime.PROPERTY_CONFIGURATION_NAME
- ((RuntimeWorkingCopy) runtime).setAttribute("org.jboss.ide.eclipse.as.core.runtime.configurationName", JBOSS_AS_DEFAULT_CONFIGURATION_NAME); //$NON-NLS-1$
+ // JBIDE-9643
+ // ((RuntimeWorkingCopy) runtime).setAttribute("org.jboss.ide.eclipse.as.core.runtime.configurationName", JBOSS_AS_DEFAULT_CONFIGURATION_NAME); //$NON-NLS-1$
return runtime.save(false, progressMonitor);
}
@@ -296,11 +292,12 @@
// JBIDE-7822
//String deployVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("deploy").toOSString(); //$NON-NLS-1$ //$NON-NLS-2$
//((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.deployDirectory", deployVal); //$NON-NLS-1$
- ((ServerWorkingCopy) server).setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_SERVER);
+ // JBIDE-9643
+ // ((ServerWorkingCopy) server).setAttribute(IDeployableServer.DEPLOY_DIRECTORY_TYPE, IDeployableServer.DEPLOY_SERVER);
// IDeployableServer.TEMP_DEPLOY_DIRECTORY
- String deployTmpFolderVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("tmp").append("jbosstoolsTemp").toOSString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.tempDeployDirectory", deployTmpFolderVal); //$NON-NLS-1$
+ // String deployTmpFolderVal = runtime.getLocation().append("server").append(JBOSS_AS_DEFAULT_CONFIGURATION_NAME).append("tmp").append("jbosstoolsTemp").toOSString(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ // ((ServerWorkingCopy) server).setAttribute("org.jboss.ide.eclipse.as.core.server.tempDeployDirectory", deployTmpFolderVal); //$NON-NLS-1$
// If we'd need to set up a username / pw for JMX, do it here.
// ((ServerWorkingCopy)serverWC).setAttribute(JBossServer.SERVER_USERNAME, authUser);
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34510 - branches/jbosstools-3.2.x/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-09-03 04:28:38 -0400 (Sat, 03 Sep 2011)
New Revision: 34510
Modified:
branches/jbosstools-3.2.x/build/publish.sh
Log:
incomplete backport of changes in trunk/build/publish.sh to 32x branch per JBIDE-8667, causing JBIDE-9647
Modified: branches/jbosstools-3.2.x/build/publish.sh
===================================================================
--- branches/jbosstools-3.2.x/build/publish.sh 2011-09-02 23:52:01 UTC (rev 34509)
+++ branches/jbosstools-3.2.x/build/publish.sh 2011-09-03 08:28:38 UTC (rev 34510)
@@ -45,6 +45,12 @@
siteZip=${WORKSPACE}/sources/aggregate/site/target/site.zip
fi
z=$siteZip
+elif [[ -d ${WORKSPACE}/sources/aggregate/site/site/target ]]; then
+ siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip
+ if [[ ! -f ${WORKSPACE}/sources/aggregate/site/site/target/site_assembly.zip ]]; then
+ siteZip=${WORKSPACE}/sources/aggregate/site/site/target/site.zip
+ fi
+ z=$siteZip
elif [[ -d ${WORKSPACE}/sources/site/target ]]; then
siteZip=${WORKSPACE}/sources/site/target/site_assembly.zip
if [[ ! -f ${WORKSPACE}/sources/site/target/site_assembly.zip ]]; then
@@ -292,6 +298,85 @@
# and create/replace a snapshot dir w/ static URL
date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
+
+ # 1. To recursively purge contents of .../staging.previous/foobar/ folder:
+ # mkdir -p /tmp/foobar;
+ # rsync -aPrz --delete /tmp/foobar tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ # 2. To then remove entire .../staging.previous/foobar/ folder:
+ # echo -e "rmdir foobar" | sftp tools@filemgmt.jboss.org:/downloads_htdocs/tools/builds/staging.previous/
+ # rmdir /tmp/foobar
+
+ # JBIDE-8667 move current to previous; move next to current
+ if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
+ # create folders if not already there (could be empty)
+ echo -e "mkdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
+ #echo -e "mkdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
+
+ # IF using .2 folders, purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
+ # NOTE: comment out next section - should only purge one staging.previous/* folder
+ #mkdir -p /tmp/${JOB_NAME}.2
+ #rsync -arzq --delete --protocol=28 /tmp/${JOB_NAME}.2 $DESTINATION/builds/staging.previous/
+ #echo -e "rmdir ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
+ #rmdir /tmp/${JOB_NAME}.2
+
+ # OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
+ mkdir -p /tmp/${JOB_NAME}
+ rsync -arzq --protocol=28 --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
+ echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
+ rmdir /tmp/${JOB_NAME}
+
+ # move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
+ #echo -e "rename ${JOB_NAME} ${JOB_NAME}.2" | sftp $DESTINATION/builds/staging.previous/
+
+ # move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}
+ echo -e "rename ${JOB_NAME} ../staging.previous/${JOB_NAME}" | sftp $DESTINATION/builds/staging/
+
+ # move contents of /builds/staging/${JOB_NAME}.next into /builds/staging/${JOB_NAME}
+ echo -e "rename ${JOB_NAME}.next ${JOB_NAME}" | sftp $DESTINATION/builds/staging/
+ else # work locally
+ # create folders if not already there (could be empty)
+ mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME}
+ #mkdir -p $DESTINATION/builds/staging.previous/${JOB_NAME}.2
+
+ # purge contents of /builds/staging.previous/${JOB_NAME}.2 and remove empty dir
+ # NOTE: comment out next section - should only purge one staging.previous/* folder
+ #rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}.2/
+
+ # OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
+ rm -fr $DESTINATION/builds/staging.previous/${JOB_NAME}/
+
+ # move contents of /builds/staging.previous/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}.2
+ #mv $DESTINATION/builds/staging.previous/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}.2
+
+ # move contents of /builds/staging/${JOB_NAME} into /builds/staging.previous/${JOB_NAME}
+ mv $DESTINATION/builds/staging/${JOB_NAME} $DESTINATION/builds/staging.previous/${JOB_NAME}
+
+ # move contents of /builds/staging/${JOB_NAME}.next into /builds/staging/${JOB_NAME}
+ mv $DESTINATION/builds/staging/${JOB_NAME}.next $DESTINATION/builds/staging/${JOB_NAME}
+ fi
+
+ # generate 2 ${STAGINGDIR}/all/composite*.xml files which will point at:
+ # /builds/staging/${JOB_NAME}/all/repo/
+ # /builds/staging.previous/${JOB_NAME}/all/repo/
+ # /builds/staging.previous/${JOB_NAME}.2/all/repo/
+ now=$(date +%s000)
+ echo "<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging - ${JOB_NAME} Composite' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+" > ${STAGINGDIR}/all/compositeContent.xml
+ echo "<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools Staging - ${JOB_NAME} Composite' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'> " > ${STAGINGDIR}/all/compositeArtifacts.xml
+ metadata="<properties size='2'><property name='p2.compressed' value='true'/><property name='p2.timestamp' value='"${now}"'/></properties>
+<children size='2'>
+<child location='../../../staging/${JOB_NAME}/all/repo/'/>
+<child location='../../../staging.previous/${JOB_NAME}/all/repo/'/>
+</children>
+</repository>
+"
+ echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml
+ echo $metadata >> ${STAGINGDIR}/all/compositeArtifacts.xml
+ date; rsync -arzq --protocol=28 ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/
fi
# extra publish step for aggregate update sites ONLY
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34509 - trunk/common/plugins/org.jboss.tools.common.validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-02 19:52:01 -0400 (Fri, 02 Sep 2011)
New Revision: 34509
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/
Log:
https://issues.jboss.org/browse/JBIDE-9644 Provide tests for CDI validation problem for projects with complex dependencies
Property changes on: trunk/common/plugins/org.jboss.tools.common.validation
___________________________________________________________________
Added: svn:ignore
+ target
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34508 - in trunk/common: plugins/org.jboss.tools.common.jdt.debug and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-02 19:50:44 -0400 (Fri, 02 Sep 2011)
New Revision: 34508
Added:
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestSynchronizationValidator.java
Modified:
trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java
trunk/common/plugins/org.jboss.tools.common.jdt.debug.ui/
trunk/common/plugins/org.jboss.tools.common.jdt.debug/
trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java
trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9644 Provide tests for CDI validation problem for projects with complex dependencies
Modified: trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java 2011-09-02 23:44:57 UTC (rev 34507)
+++ trunk/common/plugins/org.jboss.tools.common.base.test/src/org/jboss/tools/common/base/test/validation/ValidationExceptionTest.java 2011-09-02 23:50:44 UTC (rev 34508)
@@ -23,15 +23,15 @@
*/
public class ValidationExceptionTest extends TestCase {
- protected static ValidationExceptionLogger LOGGER;
+ protected volatile static ValidationExceptionLogger LOGGER;
public static ValidationExceptionLogger initLogger() {
LOGGER = new ValidationExceptionLogger();
return LOGGER;
}
- public void testExceptions() throws Exception {
- Set<IStatus> exceptions = LOGGER.getExceptions();
+ public static void assertExceptionsIsEmpty(ValidationExceptionLogger logger) throws Exception {
+ Set<IStatus> exceptions = logger.getExceptions();
StringBuffer error = new StringBuffer("The following exceptions were thrown during project validation:");
for (IStatus status : exceptions) {
Throwable cause = status.getException().getCause();
@@ -46,9 +46,14 @@
assertTrue(error.toString(), exceptions.isEmpty());
}
- public void testLogger() {
- CommonValidationPlugin.getDefault().logError(new JBTValidationException("Test logger", null));
- Set<IStatus> exceptions = LOGGER.getExceptions();
+ public void testExceptions() throws Exception {
+ assertExceptionsIsEmpty(LOGGER);
+ }
+
+ public void testLogging() {
+ ValidationExceptionLogger logger = new ValidationExceptionLogger();
+ CommonValidationPlugin.getDefault().logError(new JBTValidationException("Test logging", null));
+ Set<IStatus> exceptions = logger.getExceptions();
assertEquals(1, exceptions.size());
}
}
\ No newline at end of file
Property changes on: trunk/common/plugins/org.jboss.tools.common.jdt.debug
___________________________________________________________________
Added: svn:ignore
+ target
Property changes on: trunk/common/plugins/org.jboss.tools.common.jdt.debug.ui
___________________________________________________________________
Added: svn:ignore
+ target
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml 2011-09-02 23:44:57 UTC (rev 34507)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/plugin.xml 2011-09-02 23:50:44 UTC (rev 34508)
@@ -9,5 +9,10 @@
name="TestValidator"
id="org.jboss.common.validation.test.TestValidator">
</validator>
+ <validator
+ class="org.jboss.tools.common.validation.test.TestSynchronizationValidator"
+ name="TestSynchronizationValidator"
+ id="org.jboss.common.validation.test.TestSynchronizationValidator">
+ </validator>
</extension>
-</plugin>
+</plugin>
\ No newline at end of file
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java 2011-09-02 23:44:57 UTC (rev 34507)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/CommonValidationAllTests.java 2011-09-02 23:50:44 UTC (rev 34508)
@@ -15,7 +15,6 @@
import org.eclipse.jdt.internal.core.JavaModelManager;
import org.eclipse.wst.validation.ValidationFramework;
-import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
@@ -28,8 +27,6 @@
JavaModelManager.getIndexManager().disable();
ValidationFramework.getDefault().suspendAllValidation(true);
- ValidationExceptionTest.initLogger();
-
TestSuite suiteAll = new TestSuite("Common Validation Tests");
TestSuite suite = new TestSuite(ValidationTest.class.getName());
@@ -41,6 +38,8 @@
new String[]{"JavaProject"});
suiteAll.addTest(testSetup);
+ suiteAll.addTestSuite(SynchronizationTest.class);
+
return suiteAll;
}
}
\ No newline at end of file
Added: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java 2011-09-02 23:50:44 UTC (rev 34508)
@@ -0,0 +1,256 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.validation.test;
+
+import java.io.InputStream;
+import java.io.Reader;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFileState;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IPathVariableManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IProjectDescription;
+import org.eclipse.core.resources.IResourceProxy;
+import org.eclipse.core.resources.IResourceProxyVisitor;
+import org.eclipse.core.resources.IResourceVisitor;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourceAttributes;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.content.IContentDescription;
+import org.eclipse.core.runtime.jobs.ISchedulingRule;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionLogger;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.ValidatorManager;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class SynchronizationTest extends TestCase {
+
+ static final IProject CHANGED_PROJECT_1 = ResourcesPlugin.getWorkspace().getRoot().getProject("ChangedProject1"); // Fake project which is "changed" by user. Thread 1.
+ static final IProject PROJECT_A_1 = ResourcesPlugin.getWorkspace().getRoot().getProject("ProjectA1"); // Fake root project. Depends on ChangedProject1.
+ static final IProject CHANGED_PROJECT_B_1 = ResourcesPlugin.getWorkspace().getRoot().getProject("ChangedProjectB1"); // Fake project which is "changed" by user. Thread 2. Depends on ChangedProject1
+ static final IProject PROJECT_B_2 = ResourcesPlugin.getWorkspace().getRoot().getProject("ProjectB2"); // Fake root project. Depends on ChangedProjectB1.
+ static final IProject PROJECT_B_A_1 = ResourcesPlugin.getWorkspace().getRoot().getProject("ProjectBA1"); // Fake root project. Depends on ChangedProjectB1.
+
+ public void testSynchronizedValidatotion() throws Exception {
+ ValidationExceptionLogger logger = new ValidationExceptionLogger();
+
+ final ContextValidationHelper helperThread1 = new ContextValidationHelper();
+ helperThread1.setProject(CHANGED_PROJECT_B_1);
+ FakeFile changeFileProjectB1 = new FakeFile(CHANGED_PROJECT_B_1, "ChangeFileProjectB1.java");
+ helperThread1.registerResource(changeFileProjectB1);
+ helperThread1.setValidationFileURIs(new ArrayList<String>());
+ final ValidatorManager managerThread1 = new ValidatorManager();
+
+ final ContextValidationHelper helperThread2 = new ContextValidationHelper();
+ helperThread2.setProject(CHANGED_PROJECT_1);
+ FakeFile changeFileProject1 = new FakeFile(CHANGED_PROJECT_1, "ChangeFileProject1.java");
+ helperThread2.registerResource(changeFileProject1);
+ helperThread2.setValidationFileURIs(new ArrayList<String>());
+ final ValidatorManager managerThread2 = new ValidatorManager();
+
+ final ThreadHolder threadHolder = new ThreadHolder();
+ for (int i = 1; i < 4; i++) {
+ Runnable thread1 = new Runnable() {
+ public void run() {
+ try {
+ managerThread1.validate(helperThread1, null);
+ } catch (ValidationException e) {
+ threadHolder.setException(e);
+ } finally {
+ threadHolder.finish();
+ }
+ }
+ };
+ Runnable thread2 = new Runnable() {
+ public void run() {
+ try {
+ managerThread2.validate(helperThread2, null);
+ } catch (ValidationException e) {
+ threadHolder.setException(e);
+ } finally {
+ threadHolder.finish();
+ }
+ }
+ };
+
+ threadHolder.start();
+ new Thread(thread1).start();
+ threadHolder.start();
+ new Thread(thread2).start();
+
+ // Wait for all validators
+ while (!threadHolder.isReady()) {
+ Thread.sleep(10);
+ }
+ if(threadHolder.getException()!=null) {
+ throw new Exception(threadHolder.getException());
+ }
+ ValidationExceptionTest.assertExceptionsIsEmpty(logger);
+ assertProjectValidation(i, PROJECT_A_1);
+ assertProjectValidation(i, PROJECT_B_2);
+ assertProjectValidation(i, PROJECT_B_A_1);
+ }
+ }
+
+ private void assertProjectValidation(int attempt, IProject project) {
+ assertTrue("Project " + project.getName() + " has not been validated. Attemp #" + attempt, TestSynchronizationValidator.isProjectValidated(project));
+ }
+
+ private static class ThreadHolder {
+ private Exception exception;
+ private int startedValidators;
+
+ public synchronized void finish() {
+ startedValidators--;
+ }
+ public synchronized void start() {
+ startedValidators++;
+ }
+ public synchronized boolean isReady() {
+ return startedValidators==0;
+ }
+ public synchronized Exception getException() {
+ return exception;
+ }
+ public synchronized void setException(Exception exception) {
+ this.exception = exception;
+ }
+ }
+
+ private static class FakeFile implements IFile {
+ private IProject project;
+ private String name;
+ public FakeFile(IProject project, String name) {
+ this.project = project;
+ this.name = name;
+ }
+ public boolean exists() {
+ return true;
+ }
+ public String getFileExtension() {
+ return name.substring(name.lastIndexOf('.'));
+ }
+ public IContainer getParent() {
+ return project;
+ }
+ public IProject getProject() {
+ return project;
+ }
+ public boolean isAccessible() {
+ return true;
+ }
+ public void accept(IResourceProxyVisitor visitor, int memberFlags) throws CoreException {}
+ public void accept(IResourceVisitor visitor) throws CoreException {}
+ public void accept(IResourceVisitor visitor, int depth, boolean includePhantoms) throws CoreException {}
+ public void accept(IResourceVisitor visitor, int depth, int memberFlags) throws CoreException {}
+ public void clearHistory(IProgressMonitor monitor) throws CoreException {}
+ public void copy(IPath destination, boolean force, IProgressMonitor monitor) throws CoreException {}
+ public void copy(IPath destination, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void copy(IProjectDescription description, boolean force, IProgressMonitor monitor) throws CoreException {}
+ public void copy(IProjectDescription description, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public IMarker createMarker(String type) throws CoreException {return null;}
+ public IResourceProxy createProxy() {return null;}
+ public void delete(boolean force, IProgressMonitor monitor) throws CoreException {}
+ public void delete(int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void deleteMarkers(String type, boolean includeSubtypes, int depth) throws CoreException {}
+ public IMarker findMarker(long id) throws CoreException {return null;}
+ public IMarker[] findMarkers(String type, boolean includeSubtypes, int depth) throws CoreException {return null;}
+ public int findMaxProblemSeverity(String type, boolean includeSubtypes, int depth) throws CoreException {return 0;}
+ public long getLocalTimeStamp() {return 0;}
+ public IPath getLocation() {return null;}
+ public URI getLocationURI() {return null;}
+ public IMarker getMarker(long id) {return null;}
+ public long getModificationStamp() {return 0;}
+ public IPathVariableManager getPathVariableManager() {return null;}
+ public Map<QualifiedName, String> getPersistentProperties() throws CoreException {return null;}
+ public String getPersistentProperty(QualifiedName key) throws CoreException {return null;}
+ public IPath getProjectRelativePath() {return null;}
+ public IPath getRawLocation() {return null;}
+ public URI getRawLocationURI() {return null;}
+ public ResourceAttributes getResourceAttributes() {return null;}
+ public Map<QualifiedName, Object> getSessionProperties() throws CoreException {return null;}
+ public Object getSessionProperty(QualifiedName key) throws CoreException {return null;}
+ public int getType() {return 0;}
+ public IWorkspace getWorkspace() {return null;}
+ public boolean isDerived() {return false;}
+ public boolean isDerived(int options) {return false;}
+ public boolean isHidden() {return false;}
+ public boolean isHidden(int options) {return false;}
+ public boolean isLinked() {return false;}
+ public boolean isVirtual() {return false;}
+ public boolean isLinked(int options) {return false;}
+ public boolean isLocal(int depth) {return false;}
+ public boolean isPhantom() {return false;}
+ public boolean isSynchronized(int depth) {return false;}
+ public boolean isTeamPrivateMember() {return false;}
+ public boolean isTeamPrivateMember(int options) {return false;}
+ public void move(IPath destination, boolean force, IProgressMonitor monitor) throws CoreException {}
+ public void move(IPath destination, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void move(IProjectDescription description, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
+ public void move(IProjectDescription description, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void refreshLocal(int depth, IProgressMonitor monitor) throws CoreException {}
+ public void revertModificationStamp(long value) throws CoreException {}
+ public void setDerived(boolean isDerived) throws CoreException {}
+ public void setDerived(boolean isDerived, IProgressMonitor monitor) throws CoreException {}
+ public void setHidden(boolean isHidden) throws CoreException {}
+ public void setLocal(boolean flag, int depth, IProgressMonitor monitor) throws CoreException {}
+ public long setLocalTimeStamp(long value) throws CoreException {return 0;}
+ public void setPersistentProperty(QualifiedName key, String value) throws CoreException {}
+ public void setReadOnly(boolean readOnly) {}
+ public void setResourceAttributes(ResourceAttributes attributes) throws CoreException {}
+ public void setSessionProperty(QualifiedName key, Object value) throws CoreException {}
+ public void setTeamPrivateMember(boolean isTeamPrivate) throws CoreException {}
+ public void touch(IProgressMonitor monitor) throws CoreException {}
+ public Object getAdapter(Class adapter) {return null;}
+ public boolean contains(ISchedulingRule rule) {return false;}
+ public boolean isConflicting(ISchedulingRule rule) {return false;}
+ public void appendContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
+ public void appendContents(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void create(InputStream source, boolean force, IProgressMonitor monitor) throws CoreException {}
+ public void create(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void createLink(IPath localLocation, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void createLink(URI location, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void delete(boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
+ public String getCharset() throws CoreException {return null;}
+ public String getCharset(boolean checkImplicit) throws CoreException {return null;}
+ public String getCharsetFor(Reader reader) throws CoreException {return null;}
+ public IContentDescription getContentDescription() throws CoreException {return null;}
+ public InputStream getContents() throws CoreException {return null;}
+ public InputStream getContents(boolean force) throws CoreException {return null;}
+ public int getEncoding() throws CoreException {return 0;}
+ public IPath getFullPath() {return null;}
+ public IFileState[] getHistory(IProgressMonitor monitor) throws CoreException {return null;}
+ public String getName() {return null;}
+ public boolean isReadOnly() {return false;}
+ public void move(IPath destination, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
+ public void setCharset(String newCharset) throws CoreException {}
+ public void setCharset(String newCharset, IProgressMonitor monitor) throws CoreException {}
+ public void setContents(InputStream source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
+ public void setContents(IFileState source, boolean force, boolean keepHistory, IProgressMonitor monitor) throws CoreException {}
+ public void setContents(InputStream source, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ public void setContents(IFileState source, int updateFlags, IProgressMonitor monitor) throws CoreException {}
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/SynchronizationTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestSynchronizationValidator.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestSynchronizationValidator.java (rev 0)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestSynchronizationValidator.java 2011-09-02 23:50:44 UTC (rev 34508)
@@ -0,0 +1,191 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.common.validation.test;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.wst.validation.internal.core.ValidationException;
+import org.eclipse.wst.validation.internal.provisional.core.IReporter;
+import org.jboss.tools.common.validation.ContextValidationHelper;
+import org.jboss.tools.common.validation.IProjectValidationContext;
+import org.jboss.tools.common.validation.IValidatingProjectSet;
+import org.jboss.tools.common.validation.IValidatingProjectTree;
+import org.jboss.tools.common.validation.IValidator;
+import org.jboss.tools.common.validation.ValidatorManager;
+import org.jboss.tools.common.validation.internal.ProjectValidationContext;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class TestSynchronizationValidator implements IValidator {
+
+ private final static TestValidatingProjectTree PROJECT_BRANCH_FOR_CHANGED_PROJECT_1 = new TestValidatingProjectTree(
+ new TestValidatingProjectSet(SynchronizationTest.CHANGED_PROJECT_1, SynchronizationTest.PROJECT_A_1),
+ new TestValidatingProjectSet(SynchronizationTest.CHANGED_PROJECT_1, SynchronizationTest.CHANGED_PROJECT_B_1, SynchronizationTest.PROJECT_B_2),
+ new TestValidatingProjectSet(SynchronizationTest.CHANGED_PROJECT_1, SynchronizationTest.CHANGED_PROJECT_B_1, SynchronizationTest.PROJECT_B_A_1));
+
+ private final static TestValidatingProjectTree PROJECT_BRANCH_FOR_CHANGED_PROJECT_B_1 = new TestValidatingProjectTree(
+ new TestValidatingProjectSet(SynchronizationTest.CHANGED_PROJECT_1, SynchronizationTest.CHANGED_PROJECT_B_1, SynchronizationTest.PROJECT_B_A_1),
+ new TestValidatingProjectSet(SynchronizationTest.CHANGED_PROJECT_1, SynchronizationTest.CHANGED_PROJECT_B_1, SynchronizationTest.PROJECT_B_2));
+
+ private final static Map<IProject, TestValidatingProjectTree> PROJECT_TREE;
+ static {
+ PROJECT_TREE = new HashMap<IProject, TestSynchronizationValidator.TestValidatingProjectTree>();
+ PROJECT_TREE.put(SynchronizationTest.CHANGED_PROJECT_1, PROJECT_BRANCH_FOR_CHANGED_PROJECT_1);
+ PROJECT_TREE.put(SynchronizationTest.CHANGED_PROJECT_B_1, PROJECT_BRANCH_FOR_CHANGED_PROJECT_B_1);
+ }
+
+ private final static Set<IProject> VALIDATED_ROOT_PROJECTS = new HashSet<IProject>();
+
+ private static class TestValidatingProjectSet implements IValidatingProjectSet {
+
+ private IProject[] projects;
+
+ public TestValidatingProjectSet(IProject... projects) {
+ this.projects = projects;
+ }
+
+ public IProject getRootProject() {
+ return projects[projects.length-1];
+ }
+
+ public Set<IProject> getAllProjects() {
+ Set<IProject> result = new HashSet<IProject>();
+ for (IProject project : projects) {
+ result.add(project);
+ }
+ return result;
+ }
+
+ public IProjectValidationContext getRootContext() {
+ return new ProjectValidationContext();
+ }
+ }
+
+ private static class TestValidatingProjectTree implements IValidatingProjectTree {
+
+ private Map<IProject, IValidatingProjectSet> projects;
+
+ public TestValidatingProjectTree(IValidatingProjectSet... projectBrunches) {
+ projects = new HashMap<IProject, IValidatingProjectSet>();
+ for (IValidatingProjectSet projectSet : projectBrunches) {
+ projects.put(projectSet.getRootProject(), projectSet);
+ }
+ }
+
+ public Map<IProject, IValidatingProjectSet> getBrunches() {
+ return projects;
+ }
+
+ public Set<IProject> getAllProjects() {
+ Set<IProject> result = new HashSet<IProject>();
+ for (IValidatingProjectSet projectSet : projects.values()) {
+ result.addAll(projectSet.getAllProjects());
+ }
+ return result;
+ }
+
+ public void addProject(IProject project) {
+ }
+ }
+
+ private static synchronized void projectHasBeenValidated(IProject project) {
+ VALIDATED_ROOT_PROJECTS.add(project);
+ }
+
+ public static synchronized void clear() {
+ VALIDATED_ROOT_PROJECTS.clear();
+ }
+
+ public static synchronized boolean isProjectValidated(IProject project) {
+ return VALIDATED_ROOT_PROJECTS.contains(project);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#validate(java.util.Set, org.eclipse.core.resources.IProject, org.jboss.tools.common.validation.ContextValidationHelper, org.jboss.tools.common.validation.IProjectValidationContext, org.jboss.tools.common.validation.ValidatorManager, org.eclipse.wst.validation.internal.provisional.core.IReporter)
+ */
+ @Override
+ public IStatus validate(Set<IFile> changedFiles, IProject project,
+ ContextValidationHelper validationHelper,
+ IProjectValidationContext validationContext,
+ ValidatorManager manager, IReporter reporter)
+ throws ValidationException {
+ for (IFile file : changedFiles) {
+ IProject changedProject = file.getProject();
+ validateAll(changedProject, validationHelper, validationContext, manager, reporter);
+ }
+ return ValidatorManager.OK_STATUS;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#validateAll(org.eclipse.core.resources.IProject, org.jboss.tools.common.validation.ContextValidationHelper, org.jboss.tools.common.validation.IProjectValidationContext, org.jboss.tools.common.validation.ValidatorManager, org.eclipse.wst.validation.internal.provisional.core.IReporter)
+ */
+ @Override
+ public IStatus validateAll(IProject project,
+ ContextValidationHelper validationHelper,
+ IProjectValidationContext validationContext,
+ ValidatorManager manager, IReporter reporter)
+ throws ValidationException {
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException e) {
+ // Ignore
+ }
+ projectHasBeenValidated(project);
+ return ValidatorManager.OK_STATUS;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#getId()
+ */
+ @Override
+ public String getId() {
+ return "org.jboss.common.validation.test.TestSynchronizationValidator";
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#getBuilderId()
+ */
+ @Override
+ public String getBuilderId() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#getValidatingProjects(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ public IValidatingProjectTree getValidatingProjects(IProject project) {
+ return PROJECT_TREE.get(project);
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#shouldValidate(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ public boolean shouldValidate(IProject project) {
+ return project.getName().startsWith("ChangedProject");
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.common.validation.IValidator#isEnabled(org.eclipse.core.resources.IProject)
+ */
+ @Override
+ public boolean isEnabled(IProject project) {
+ return shouldValidate(project);
+ }
+}
\ No newline at end of file
Property changes on: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/TestSynchronizationValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java
===================================================================
--- trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java 2011-09-02 23:44:57 UTC (rev 34507)
+++ trunk/common/tests/org.jboss.tools.common.validation.test/src/org/jboss/tools/common/validation/test/ValidationTest.java 2011-09-02 23:50:44 UTC (rev 34508)
@@ -12,32 +12,29 @@
import java.util.Set;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.jboss.tools.common.base.test.validation.TestUtil;
+import org.jboss.tools.common.base.test.validation.ValidationExceptionLogger;
import org.jboss.tools.common.base.test.validation.ValidationExceptionTest;
-import org.jboss.tools.common.validation.CommonValidationPlugin;
-import org.jboss.tools.common.validation.JBTValidationException;
/**
* @author Alexey Kazakov
*/
-public class ValidationTest extends ValidationExceptionTest {
+public class ValidationTest extends TestCase {
- @Override
public void testExceptions() throws Exception {
+ ValidationExceptionLogger logger = new ValidationExceptionLogger();
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject("JavaProject");
TestUtil._waitForValidation(project);
- Set<IStatus> exceptions = LOGGER.getExceptions();
+ Set<IStatus> exceptions = logger.getExceptions();
assertFalse(exceptions.isEmpty());
}
- @Override
- public void testLogger() {
- initLogger();
- CommonValidationPlugin.getDefault().logError(new JBTValidationException("Test logger", null));
- Set<IStatus> exceptions = LOGGER.getExceptions();
- assertEquals(1, exceptions.size());
+ public void testLogging() {
+ new ValidationExceptionTest().testLogging();
}
}
\ No newline at end of file
14 years, 7 months
- 1
- 0
JBoss Tools SVN: r34507 - in trunk/seam/plugins: org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-02 19:44:57 -0400 (Fri, 02 Sep 2011)
New Revision: 34507
Modified:
trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
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/SeamFacetAbstractInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
Log:
There should be an option to/not to copy the libraries when user create New Seam Project. https://issues.jboss.org/browse/JBIDE-2927
Modified: trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.base.test/src/org/jboss/tools/seam/core/test/project/facet/AbstractSeamFacetTest.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -201,6 +201,7 @@
config.setStringProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "noop-connection");
config.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH, new String[] { "noop-driver.jar" });
config.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, true);
+ config.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING, true);
return config;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/ISeamFacetDataModelProperties.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -311,4 +311,13 @@
* Can be "true" or "false".
*/
String SEAM_RUNTIME_LIBRARIES_COPYING = "seam.runtime.libraries.copying"; //$NON-NLS-1$
+
+ /**
+ * This flag indicates that we should copy Seam templates and libraries from Seam Runtime to projects.
+ * Can be "true" or "false".
+ */
+ String SEAM_TEMPLATES_AND_LIBRARIES_COPYING = "seam.templates.copying"; //$NON-NLS-1$
+
+ String SEAM_LIBRARY_PROVIDER = "seam.runtime.library.provider"; //$NON-NLS-1$
+
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -113,7 +113,7 @@
IDataModel model, IProgressMonitor monitor) throws CoreException {
super.doExecuteForEjb(project, fv, model, monitor);
IResource src = getSrcFolder(project);
- if(src!=null && seamHomeFolder!=null && shouldCopySeamRuntimeLibraries(model)) {
+ if(src!=null && seamHomeFolder!=null && shouldCopyLibrariesAndTemplates(model)) {
File srcFile = src.getLocation().toFile();
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "security.drl"), srcFile, false); //$NON-NLS-1$
}
@@ -126,24 +126,24 @@
@Override
protected void copyFilesToWarProject(final IProject project, IProjectFacetVersion fv,
IDataModel model, IProgressMonitor monitor) throws CoreException {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
super.copyFilesToWarProject(project, fv, model, monitor);
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
if(isWarConfiguration(model)) {
- if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
+ if (!SeamCorePlugin.getDefault().hasM2Facet(project) && shouldCopyLibraries(model)) {
AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamHomeFolder)));
AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamLibFolder)));
}
final IContainer source = warActionSrcRootFolder.getUnderlyingFolder();
File actionsSrc = new File(project.getLocation().toFile(), source.getFullPath().removeFirstSegments(1).toString());
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "seam.properties"), actionsSrc, true); //$NON-NLS-1$
- if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
+ if (!SeamCorePlugin.getDefault().hasM2Facet(project) && shouldCopyLibraries(model)) {
AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(droolsLibFolder)));
}
} else {
- if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
+ if (!SeamCorePlugin.getDefault().hasM2Facet(project) && shouldCopyLibraries(model)) {
AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamHomeFolder)));
AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamLibFolder)));
AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(droolsLibFolder)));
@@ -157,15 +157,17 @@
*/
@Override
protected void fillEarContents(IProject project, IDataModel model) {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
if (!SeamCorePlugin.getDefault().hasM2Facet(project)) {
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
- AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
- AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_LIB).dir(seamLibFolder)), false);
- AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
+ if(shouldCopyLibraries(model)){
+ AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
+ AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_LIB).dir(seamLibFolder)), false);
+ AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
+ }
AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false);
}
}
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 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2ProjectCreator.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -90,7 +90,7 @@
@Override
protected void createEarProject() {
super.createEarProject();
- if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopySeamRuntimeLibraries(model)) {
+ if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopyLibrariesAndTemplates(model) && shouldCopyLibraries(model)) {
File earContentsFolder = new File(earProjectFolder, "EarContent"); //$NON-NLS-1$
File earLibFolder = new File(earContentsFolder, "lib"); //$NON-NLS-1$
AntCopyUtils.copyFiles(seamLibFolder, earLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(Seam2FacetInstallDelegate.JBOSS_EAR_LIB).dir(seamLibFolder)));
@@ -99,7 +99,7 @@
@Override
protected boolean createTestProject() {
- if(!(Boolean)model.getProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING) || !shouldCopySeamRuntimeLibraries(model))
+ if(!(Boolean)model.getProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING) || !shouldCopyLibrariesAndTemplates(model))
return false;
File testProjectDir = new File(seamWebProject.getLocation().removeLastSegments(1).toFile(), testProjectName); //$NON-NLS-1$
@@ -228,7 +228,7 @@
}
}
- if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject)) {
+ if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopyLibraries(model)) {
AntCopyUtils.copyFiles(new File(seamRuntime.getHomeDir(), "lib"), //$NON-NLS-1$
testLibDir, new AntCopyUtils.FileSetFileFilter(includeLibs));
@@ -245,7 +245,7 @@
protected void createEjbProject() {
super.createEjbProject();
// Copy security.drl to source folder
- if(shouldCopySeamRuntimeLibraries(model))
+ if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "security.drl"), new File(ejbProjectFolder, "ejbModule/"), true); //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -399,7 +399,7 @@
protected void copyFilesToWarProject(IProject project, IProjectFacetVersion fv,
IDataModel model, IProgressMonitor monitor) throws CoreException {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
final AntCopyUtils.FileSet viewFileSet = new AntCopyUtils.FileSet(VIEW_FILESET).dir(seamGenViewSource);
@@ -567,7 +567,7 @@
FilterSet earFilterSet = new FilterSet();
earFilterSet.addFilter("projectName", project.getName() + ".ear"); //$NON-NLS-1$ //$NON-NLS-2$
- if(shouldCopySeamRuntimeLibraries(model)){
+ if(shouldCopyLibrariesAndTemplates(model)){
AntCopyUtils.copyFileToFolder(
new File(seamGenResFolder, "META-INF/jboss-app.xml"), //$NON-NLS-1$
metaInfFolder, new FilterSetCollection(earFilterSet), false);
@@ -577,7 +577,7 @@
configureApplicationXml(project, monitor);
}
- if(shouldCopySeamRuntimeLibraries(model)){
+ if(shouldCopyLibrariesAndTemplates(model)){
// Copy configuration files from template
try {
AntCopyUtils.copyFilesAndFolders(
@@ -590,7 +590,7 @@
fillEarContents(project, model);
- if(shouldCopySeamRuntimeLibraries(model)){
+ if(shouldCopyLibrariesAndTemplates(model)){
File resources = new File(earProjectFolder, "resources"); //$NON-NLS-1$
AntCopyUtils.copyFileToFile(
dataSourceDsFile, new File(resources, project.getName() + "-ds.xml"), //$NON-NLS-1$
@@ -683,7 +683,7 @@
viewFilterSetCollection.addFilterSet(projectFilterSet);
File srcFile = src.getLocation().toFile();
- if(shouldCopySeamRuntimeLibraries(model)){
+ if(shouldCopyLibrariesAndTemplates(model)){
// Copy sources to EJB project in case of EAR configuration
AntCopyUtils.copyFileToFile(
new File(seamGenHomeFolder, "src/Authenticator.java"), //$NON-NLS-1$
@@ -692,7 +692,7 @@
}
File persistentXml = new File(srcFile, "META-INF/persistence.xml"); //$NON-NLS-1$
- if(!persistentXml.exists() && shouldCopySeamRuntimeLibraries(model)) {
+ if(!persistentXml.exists() && shouldCopyLibrariesAndTemplates(model)) {
AntCopyUtils.copyFileToFile(persistenceFile, new File(srcFile, "META-INF/persistence.xml"), //$NON-NLS-1$
viewFilterSetCollection, false);
} else {
@@ -705,12 +705,12 @@
}
AntCopyUtils.FileSet ejbSrcResourcesSet = new AntCopyUtils.FileSet(JBOOS_EJB_WEB_INF_CLASSES_SET).dir(seamGenResFolder);
- if(shouldCopySeamRuntimeLibraries(model)){
+ if(shouldCopyLibrariesAndTemplates(model)){
AntCopyUtils.copyFilesAndFolders(seamGenResFolder, srcFile, new AntCopyUtils.FileSetFileFilter(ejbSrcResourcesSet), viewFilterSetCollection, false);
}
File ejbJarXml = new File(srcFile, "META-INF/ejb-jar.xml"); //$NON-NLS-1$
- if(!ejbJarXml.exists() && shouldCopySeamRuntimeLibraries(model)) {
+ if(!ejbJarXml.exists() && shouldCopyLibrariesAndTemplates(model)) {
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder, "META-INF/ejb-jar.xml"), //$NON-NLS-1$
new File(srcFile, "META-INF"), viewFilterSetCollection, false); //$NON-NLS-1$
} else {
@@ -718,7 +718,7 @@
}
}
- if(shouldCopySeamRuntimeLibraries(model)){
+ if(shouldCopyLibrariesAndTemplates(model)){
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile,
new File(ejbProjectFolder, getLaunchCfgName(ejbProjectFolder.getName()) + ".launch"), //$NON-NLS-1$
@@ -1305,7 +1305,11 @@
protected abstract SeamProjectCreator getProjectCreator(IDataModel model, IProject project);
- protected boolean shouldCopySeamRuntimeLibraries(IDataModel model){
+ protected boolean shouldCopyLibrariesAndTemplates(IDataModel model){
+ return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING);
+ }
+
+ protected boolean shouldCopyLibraries(IDataModel model){
return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING);
}
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -93,6 +93,8 @@
names.add(CONFIGURE_DEFAULT_SEAM_RUNTIME);
names.add(CONFIGURE_WAR_PROJECT);
names.add(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING);
+ names.add(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING);
+ names.add(ISeamFacetDataModelProperties.SEAM_LIBRARY_PROVIDER);
return names;
}
@@ -133,6 +135,10 @@
return Boolean.TRUE;
} else if (SEAM_RUNTIME_LIBRARIES_COPYING.equals(propertyName)) {
return Boolean.TRUE;
+ } else if (SEAM_TEMPLATES_AND_LIBRARIES_COPYING.equals(propertyName)) {
+ return Boolean.TRUE;
+ } else if (SEAM_LIBRARY_PROVIDER.equals(propertyName)) {
+ return null;
}
return super.getDefaultProperty(propertyName);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -132,19 +132,21 @@
protected void copyFilesToWarProject(final IProject project, IProjectFacetVersion fv,
IDataModel model, IProgressMonitor monitor) throws CoreException {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
super.copyFilesToWarProject(project, fv, model, monitor);
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
- if (isWarConfiguration(model)) {
- AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamHomeFolder)));
- AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamLibFolder)));
- AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(droolsLibFolder)));
- } else {
- AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamHomeFolder)));
- AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamLibFolder)));
- AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(droolsLibFolder)));
+ if(shouldCopyLibraries(model)){
+ if (isWarConfiguration(model)) {
+ AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamHomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_WAR_CONFIG).dir(droolsLibFolder)));
+ } else {
+ AntCopyUtils.copyFiles(seamHomeFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamHomeFolder)));
+ AntCopyUtils.copyFiles(seamLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(seamLibFolder)));
+ AntCopyUtils.copyFiles(droolsLibFolder, webLibFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_WAR_LIB_FILESET_EAR_CONFIG).dir(droolsLibFolder)));
+ }
}
}
@@ -154,13 +156,15 @@
*/
@Override
protected void fillEarContents(IProject project, IDataModel model) {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
final File droolsLibFolder = new File(seamHomePath, DROOLS_LIB_SEAM_RELATED_PATH);
- AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
- AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
- AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
+ if(shouldCopyLibraries(model)){
+ AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamHomeFolder)), false);
+ AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamLibFolder)), false);
+ AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(droolsLibFolder)), false);
+ }
AntCopyUtils.copyFiles(seamGenResFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder)), false);
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -287,7 +287,7 @@
manifestFilterWar.addFilter("earLibs", earJarsStrWar.toString()); //$NON-NLS-1$
manifestFilterColWar.addFilterSet(manifestFilterWar);
- if(shouldCopySeamRuntimeLibraries(model))
+ if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "war/META-INF/MANIFEST.MF"), webMetaInf, manifestFilterColWar, true); //$NON-NLS-1$
FilterSetCollection manifestFilterColEjb = new FilterSetCollection(projectFilterSet);
@@ -295,7 +295,7 @@
manifestFilterEjb.addFilter("earClasspath", earJarsStrEjb.toString()); //$NON-NLS-1$
manifestFilterColEjb.addFilterSet(manifestFilterEjb);
- if(shouldCopySeamRuntimeLibraries(model))
+ if(shouldCopyLibrariesAndTemplates(model))
AntCopyUtils.copyFileToFolder(new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(), "ejb/ejbModule/META-INF/MANIFEST.MF"), ejbMetaInf, manifestFilterColEjb, true); //$NON-NLS-1$
} catch (IOException e) {
SeamCorePlugin.getPluginLog().logError(e);
@@ -456,7 +456,7 @@
* Creates test project for given seam web project.
*/
protected boolean createTestProject() {
- if(!(Boolean)model.getProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING) || !shouldCopySeamRuntimeLibraries(model))
+ if(!(Boolean)model.getProperty(ISeamFacetDataModelProperties.TEST_PROJECT_CREATING) || !shouldCopyLibrariesAndTemplates(model))
return false;
File testProjectDir = new File(seamWebProject.getLocation().removeLastSegments(1).toFile(), testProjectName); //$NON-NLS-1$
@@ -514,10 +514,12 @@
embededEjbDir,
new AntCopyUtils.FileSetFileFilter(excludeCvsSvn));
- AntCopyUtils.copyFiles(
- new File(seamRuntime.getHomeDir(), "lib"), //$NON-NLS-1$
- testLibDir,
- new AntCopyUtils.FileSetFileFilter(includeLibs));
+ if(shouldCopyLibraries(model)){
+ AntCopyUtils.copyFiles(
+ new File(seamRuntime.getHomeDir(), "lib"), //$NON-NLS-1$
+ testLibDir,
+ new AntCopyUtils.FileSetFileFilter(includeLibs));
+ }
SeamFacetAbstractInstallDelegate.createComponentsProperties(testSrcDir, "", Boolean.TRUE); //$NON-NLS-1$
return true;
@@ -548,7 +550,7 @@
}
protected void createEjbProject() {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
ejbProjectFolder.mkdir();
@@ -612,7 +614,7 @@
}
protected void createEarProject() {
- if(!shouldCopySeamRuntimeLibraries(model))
+ if(!shouldCopyLibrariesAndTemplates(model))
return;
earProjectFolder.mkdir();
@@ -642,7 +644,7 @@
// Fill ear contents
AntCopyUtils.copyFiles(seamHomeFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamHomeFolder)));
- if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject)) {
+ if (!SeamCorePlugin.getDefault().hasM2Facet(seamWebProject) && shouldCopyLibraries(model)) {
AntCopyUtils.copyFiles(seamLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(seamLibFolder)));
AntCopyUtils.copyFiles(droolsLibFolder, earContentsFolder, new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(getJbossEarContent()).dir(droolsLibFolder)));
}
@@ -704,7 +706,11 @@
// Do nothing special for Seam 1.2
}
- protected boolean shouldCopySeamRuntimeLibraries(IDataModel model){
+ protected boolean shouldCopyLibrariesAndTemplates(IDataModel model){
+ return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING);
+ }
+
+ protected boolean shouldCopyLibraries(IDataModel model){
return model.getBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING);
}
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/SeamUIMessages.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -136,6 +136,12 @@
public static String SEAM_INSTALL_WIZARD_PAGE_SESSION_BEAN_PACKAGE_NAME;
public static String SEAM_INSTALL_WIZARD_PAGE_TEST_PACKAGE_NAME;
+
+ public static String SEAM_INSTALL_WIZARD_PAGE_LIBRARIES;
+
+ public static String SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES;
+
+ public static String SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER;
public static String SEAM_OPEN_ACTION_OPEN;
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -109,6 +109,8 @@
SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_EAR_PROJECT_NAME,
""); //$NON-NLS-1$
+ private IFieldEditor libraryListEditor;
+
private IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE
.createRadioEditor(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
@@ -311,7 +313,9 @@
SeamProjectPreferences.JBOSS_AS_DEFAULT_DEPLOY_AS,
this.jBossAsDeployAsEditor.getValueAsString());
- model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, isNewProjectWizard());
+ model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_TEMPLATES_AND_LIBRARIES_COPYING, isNewProjectWizard());
+
+ model.setBooleanProperty(ISeamFacetDataModelProperties.SEAM_RUNTIME_LIBRARIES_COPYING, libraryListEditor.getValueAsString().equals(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES) && isNewProjectWizard());
}
/*
@@ -411,6 +415,18 @@
registerEditor(earProjectNameditor, generalGroup, 3);
earProjectNameditor.setEnabled(getDeployAsDefaultValue().equals(ISeamFacetDataModelProperties.DEPLOY_AS_EAR));
+ List<String> providers = new ArrayList<String>();
+ providers.add(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES);
+ providers.add(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER);
+
+ libraryListEditor = IFieldEditorFactory.INSTANCE.createComboEditor(
+ ISeamFacetDataModelProperties.SEAM_LIBRARY_PROVIDER,
+ SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_LIBRARIES,
+ providers,
+ providers.get(0));
+
+ registerEditor(libraryListEditor, generalGroup, 3);
+
jBossAsDeployAsEditor.addPropertyChangeListener(new PropertyChangeListener(){
public void propertyChange(PropertyChangeEvent arg0) {
Boolean value = jBossAsDeployAsEditor.getValue() == ISeamFacetDataModelProperties.DEPLOY_AS_EAR;
@@ -510,8 +526,6 @@
ISeamFacetDataModelProperties.SEAM_TEST_PROJECT));
}
-
-
Dialog.applyDialogFont(parent);
initDefaultWizardProperties();
Object parentDm = model
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/messages.properties 2011-09-02 23:44:57 UTC (rev 34507)
@@ -66,6 +66,9 @@
SEAM_RUNTIME_LIST_FIELD_EDITOR_NAME=Name
SEAM_RUNTIME_LIST_FIELD_EDITOR_PATH=Path
SEAM_INSTALL_WIZARD_PAGE_GENERAL=General
+SEAM_INSTALL_WIZARD_PAGE_LIBRARIES=Libraries:
+SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES=Copy Libraries From Seam Runtime
+SEAM_INSTALL_WIZARD_PAGE_CONFIGURE_LATER=Configure Later
SEAM_GENERATE_ENTITIES_WIZARD_54=org.hibernate.eclipse.launch.SeamUtil
SEAM_WIZARD_FACTORY_SEAM_PROJECT=Seam Project:
SEAM_INSTALL_WIZARD_PAGE_DATABASE=Database
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2011-09-02 23:44:39 UTC (rev 34506)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2011-09-02 23:44:57 UTC (rev 34507)
@@ -418,7 +418,9 @@
String[] driverJars = (String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH);
if(driverJars!=null) {
String configFolder = jbs.getConfigDirectory();
- AntCopyUtils.copyFiles(driverJars, new File(configFolder, "lib"), false);
+ if(model.getStringProperty(ISeamFacetDataModelProperties.SEAM_LIBRARY_PROVIDER).equals(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_COPY_LIBRARIES)){
+ AntCopyUtils.copyFiles(driverJars, new File(configFolder, "lib"), false);
+ }
}
}
@@ -433,7 +435,7 @@
dsJob.schedule();
}
}
-
+
private void provideClassPath(List<IProject> projects, IProject ejbProject) throws CoreException {
if(ejbProject == null) return;
int k = 0;
14 years, 7 months
- 1
- 0