JBoss Tools SVN: r3912 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-09-28 16:29:17 -0400 (Fri, 28 Sep 2007)
New Revision: 3912
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-965
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-28 16:36:08 UTC (rev 3911)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-09-28 20:29:17 UTC (rev 3912)
@@ -29,8 +29,10 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
@@ -41,11 +43,14 @@
import org.eclipse.jst.common.project.facet.core.ClasspathHelper;
import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.ModuleCoreNature;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
+import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+import org.eclipse.wst.common.uriresolver.internal.URI;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.common.util.ResourcesUtils;
import org.jboss.tools.seam.core.ISeamProject;
@@ -314,19 +319,24 @@
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)));
-
// ********************************************************************************************
// Copy seam project indicator
// ********************************************************************************************
AntCopyUtils.copyFileToFolder(new File(seamGenResFolder,"seam.properties"), srcFolder, true);
+ final IContainer source = srcRootFolder.getUnderlyingFolder();
+
+ IPath actionSrcPath = new Path(source.getFullPath().lastSegment()+"/action");
+ IPath modelSrcPath = new Path(source.getFullPath().lastSegment()+"/model");
- IContainer source = srcRootFolder.getUnderlyingFolder();
srcRootFolder.delete(IVirtualFolder.FORCE, monitor);
- WtpUtils.createSourceFolder(project, new Path(source.getFullPath().lastSegment()+"/action"),new Path(source.getFullPath().lastSegment()), new Path("WebContent/WEB-INF/dev"));
- WtpUtils.createSourceFolder(project, new Path(source.getFullPath().lastSegment()+"/model"),new Path(source.getFullPath().lastSegment()), null);
+ WtpUtils.createSourceFolder(project, actionSrcPath, new Path(source.getFullPath().lastSegment()), new Path("WebContent/WEB-INF/dev"));
+ WtpUtils.createSourceFolder(project, modelSrcPath, new Path(source.getFullPath().lastSegment()), null);
+
+ IVirtualComponent c = ComponentCore.createComponent(project);
+ IVirtualFolder src = c.getRootFolder().getFolder("/WEB-INF/classes");
+ src.createLink(actionSrcPath.removeFirstSegments(1), 0, null);
+ src.createLink(modelSrcPath.removeFirstSegments(1), 0, null);
- // Copy sources to src
-
AntCopyUtils.copyFileToFile(
new File(seamGenHomeFolder,"src/Authenticator.java"),
new File(project.getLocation().toFile(),source.getFullPath().lastSegment()+"/model/" + model.getProperty(ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME).toString().replace('.', '/')+"/"+"Authenticator.java"),
17 years, 2 months
JBoss Tools SVN: r3911 - tags/jbossas-1.0.0.beta4.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-28 12:36:08 -0400 (Fri, 28 Sep 2007)
New Revision: 3911
Added:
tags/jbossas-1.0.0.beta4/as/
Log:
tagging
Copied: tags/jbossas-1.0.0.beta4/as (from rev 3910, trunk/as)
17 years, 2 months
JBoss Tools SVN: r3910 - tags.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-28 12:30:51 -0400 (Fri, 28 Sep 2007)
New Revision: 3910
Added:
tags/jbossas-1.0.0.beta4/
Log:
tagging
17 years, 2 months
JBoss Tools SVN: r3909 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-28 12:09:55 -0400 (Fri, 28 Sep 2007)
New Revision: 3909
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/ComplexEventLogLabelProvider.java
Log:
JBIDE-967
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/ComplexEventLogLabelProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/ComplexEventLogLabelProvider.java 2007-09-28 15:46:18 UTC (rev 3908)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/providers/events/ComplexEventLogLabelProvider.java 2007-09-28 16:09:55 UTC (rev 3909)
@@ -68,7 +68,7 @@
if( key.equals(EventLogTreeItem.DATE)) {
keyString = propertyToMessageMap.get(key) == null ? (String)key : propertyToMessageMap.get(key).toString();
valueString = getDateAsString(((Long)map.get(key)).longValue());
- p.put(keyString, valueString);
+ p.put("Occurred", valueString);
} else {
keyString = propertyToMessageMap.get(key) == null ? (String)key : propertyToMessageMap.get(key).toString();
valueStringKey = key + DELIMITER + toString2(map.get(key));
17 years, 2 months
JBoss Tools SVN: r3908 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-28 11:46:18 -0400 (Fri, 28 Sep 2007)
New Revision: 3908
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
Log:
JBIDE-971
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2007-09-28 15:27:02 UTC (rev 3907)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2007-09-28 15:46:18 UTC (rev 3908)
@@ -1,5 +1,8 @@
package org.jboss.ide.eclipse.as.core.publishers;
+import java.io.File;
+import java.util.Date;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -10,7 +13,6 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
-import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory;
import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory.SingleDeployableModuleDelegate;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher;
@@ -39,21 +41,29 @@
status = unpublish(server, module2, kind, deltaKind, modulePublishState, monitor);
} else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind || kind == IServer.PUBLISH_FULL || kind == IServer.PUBLISH_CLEAN ){
// if there's no change, do nothing. Otherwise, on change or add, re-publish
- status = publish(server, module2, kind, deltaKind, modulePublishState, monitor);
+ status = publish(server, module2, kind, deltaKind, modulePublishState, true, monitor);
} else if( ServerBehaviourDelegate.NO_CHANGE != deltaKind && kind == IServer.PUBLISH_INCREMENTAL ){
- status = publish(server, module2, kind, deltaKind, modulePublishState, monitor);
+ status = publish(server, module2, kind, deltaKind, modulePublishState, false, monitor);
}
return status;
}
- protected IStatus publish(IDeployableServer server, IModule module, int kind, int deltaKind, int modulePublishState, IProgressMonitor monitor) {
- // COPY THE FILE HERE!!!
+ protected IStatus publish(IDeployableServer server, IModule module, int kind, int deltaKind,
+ int modulePublishState, boolean updateTimestamp, IProgressMonitor monitor) {
SingleDeployableModuleDelegate delegate = (SingleDeployableModuleDelegate)module.loadAdapter(SingleDeployableModuleDelegate.class, new NullProgressMonitor());
if( delegate != null ) {
IPath sourcePath = delegate.getGlobalSourcePath();
IPath destFolder = new Path(server.getDeployDirectory());
- FileUtil.fileSafeCopy(sourcePath.toFile(), destFolder.append(sourcePath.lastSegment()).toFile());
+ File destFile = destFolder.append(sourcePath.lastSegment()).toFile();
+ FileUtil.fileSafeCopy(sourcePath.toFile(), destFile);
+ if( updateTimestamp )
+ destFile.setLastModified(new Date().getTime());
+ } else {
+ // deleted module. o noes.
+ IPath destFolder = new Path(server.getDeployDirectory());
+ IPath destFile = destFolder.append(new Path(module.getName()).lastSegment());
+ destFile.toFile().delete();
}
return null;
17 years, 2 months
JBoss Tools SVN: r3907 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2007-09-28 11:27:02 -0400 (Fri, 28 Sep 2007)
New Revision: 3907
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
Log:
JBIDE-974
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2007-09-28 15:17:05 UTC (rev 3906)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/JBossServerStartupLaunchConfiguration.java 2007-09-28 15:27:02 UTC (rev 3907)
@@ -67,7 +67,7 @@
}
public static void ensureDefaultsSet(ILaunchConfigurationWorkingCopy wc, IServer server) throws CoreException {
- if( wc.getAttribute(DEFAULTS_SET, (String)null ) == null ) {
+ if( wc.getAttribute(DEFAULTS_SET, false ) ) {
JBossServer jbs = findJBossServer(server.getId());
IJBossServerRuntime jbrt = findJBossServerRuntime(server);
String serverHome = getServerHome(jbs);
17 years, 2 months
JBoss Tools SVN: r3906 - trunk/documentation/qa.
by jbosstools-commits@lists.jboss.org
Author: anis
Date: 2007-09-28 11:17:05 -0400 (Fri, 28 Sep 2007)
New Revision: 3906
Added:
trunk/documentation/qa/TestSVN.war
Log:
Added a file remotely
Added: trunk/documentation/qa/TestSVN.war
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/qa/TestSVN.war
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 2 months
JBoss Tools SVN: r3905 - trunk/documentation/qa/Reports.
by jbosstools-commits@lists.jboss.org
Author: anis
Date: 2007-09-28 10:54:25 -0400 (Fri, 28 Sep 2007)
New Revision: 3905
Added:
trunk/documentation/qa/Reports/smoke-13.09.2007.zip
Log:
Added a file remotely
Added: trunk/documentation/qa/Reports/smoke-13.09.2007.zip
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/qa/Reports/smoke-13.09.2007.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 2 months
JBoss Tools SVN: r3904 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-09-28 10:50:45 -0400 (Fri, 28 Sep 2007)
New Revision: 3904
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
Log:
http://jira.jboss.org/jira/browse/RHDS-197
defult seam runtime name is changed to Seam 1.2.AP
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-09-28 14:34:56 UTC (rev 3903)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreferenceInitializer.java 2007-09-28 14:50:45 UTC (rev 3904)
@@ -84,7 +84,7 @@
if(seamFolder.exists() && seamFolder.isDirectory()) {
SeamRuntime rt = new SeamRuntime();
rt.setHomeDir(seamGenBuildPath);
- rt.setName(seamFolder.getName()+"."+SeamVersion.V_1_2);
+ rt.setName("Seam " + SeamVersion.V_1_2+".AP");
rt.setDefault(true);
rt.setVersion(SeamVersion.SEAM_1_2);
map.put(rt.getName(), rt);
17 years, 2 months
JBoss Tools SVN: r3903 - trunk/documentation/qa/Reports.
by jbosstools-commits@lists.jboss.org
Author: anis
Date: 2007-09-28 10:34:56 -0400 (Fri, 28 Sep 2007)
New Revision: 3903
Added:
trunk/documentation/qa/Reports/smoke-24.09.2007.zip
Log:
Added a file remotely
Added: trunk/documentation/qa/Reports/smoke-24.09.2007.zip
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/qa/Reports/smoke-24.09.2007.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 2 months