[jbosstools-commits] JBoss Tools SVN: r19642 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal and 7 other directories.

Author: snjeza Date: 2010-01-04 16:27:33 -0500 (Mon, 04 Jan 2010) New Revision: 19642 Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 Log: https://jira.jboss.org/jira/browse/JBDS-1018 Support for EPP 5 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/IPortletConstants.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -74,6 +74,8 @@ static final String SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR = "deploy/jboss-portal-ha.sar"; //$NON-NLS-1$ static final String SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL = "deploy/simple-portal"; //$NON-NLS-1$ + + static final String SERVER_DEFAULT_DEPLOY_GATEIN = "deploy/gatein.ear"; //$NON-NLS-1$ static final String TOMCAT_LIB = "lib"; //$NON-NLS-1$ Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -108,6 +108,12 @@ IPath portletXmlPath = ComponentCore.createComponent(project) .getRootFolder().getUnderlyingFolder().getRawLocation().append( new Path(IPortletConstants.CONFIG_PATH)); + IPath directory = portletXmlPath.removeLastSegments(1); + directory.toFile().mkdirs(); + File file = portletXmlPath.toFile(); + if (file != null && file.exists()) { + return; + } StringBuffer buffer = new StringBuffer(); buffer.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"); //$NON-NLS-1$ @@ -138,18 +144,18 @@ buffer.append("</portlet-app>"); //$NON-NLS-1$ buffer.append("\n"); //$NON-NLS-1$ OutputStream outputStream = null; + PrintWriter printWriter = null; try { - IPath directory = portletXmlPath.removeLastSegments(1); - directory.toFile().mkdirs(); - File file = portletXmlPath.toFile(); file.createNewFile(); outputStream = new FileOutputStream(file); - PrintWriter printWriter = new PrintWriter(outputStream); + printWriter = new PrintWriter(outputStream); printWriter.write(buffer.toString()); - printWriter.close(); } catch (Exception e) { log(e); } finally { + if (printWriter != null) { + printWriter.close(); + } if (outputStream != null) { try { outputStream.close(); @@ -157,7 +163,6 @@ } } } - } public static void log(Exception e, String message) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -79,6 +79,10 @@ IPortletConstants.SERVER_DEFAULT_DEPLOY_SIMPLE_PORTAL)) { return true; } + // GateIn Portal Server + if (exists(configFile, IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN)) { + return true; + } return false; } // Tomcat portletcontainer Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeLibrariesContainerInitializer.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -84,47 +84,27 @@ File location = runtime.getLocation().toFile(); File libDir = getLibDirectory(location); if (libDir != null) { - File[] jars = libDir - .listFiles(new FileFilter() { + File[] jars = libDir.listFiles(new FileFilter() { public boolean accept(File file) { String name = file.getName(); - return (name.startsWith(IPortletConstants.PORTLET_API) && name - .endsWith(IPortletConstants.JAR)); + return (name.startsWith(IPortletConstants.PORTLET_API) && name.endsWith(IPortletConstants.JAR)); } }); - if (jars != null) { for (int i = 0; i < jars.length; i++) { File jarFile = jars[i]; - - IPath entryPath = new Path(jarFile - .toString()); - + IPath entryPath = new Path(jarFile.toString()); IPath sourceAttachementPath = null; IPath sourceAttachementRootPath = null; - - final ClasspathDecorations dec = decorations - .getDecorations( - getDecorationManagerKey(getPath() - .toString()), - entryPath.toString()); - + final ClasspathDecorations dec = decorations.getDecorations(getDecorationManagerKey(getPath().toString()),entryPath.toString()); IClasspathAttribute[] attrs = {}; if (dec != null) { - sourceAttachementPath = dec - .getSourceAttachmentPath(); - sourceAttachementRootPath = dec - .getSourceAttachmentRootPath(); + sourceAttachementPath = dec.getSourceAttachmentPath(); + sourceAttachementRootPath = dec.getSourceAttachmentRootPath(); attrs = dec.getExtraAttributes(); } - IAccessRule[] access = {}; - IClasspathEntry entry = JavaCore - .newLibraryEntry( - entryPath, - sourceAttachementPath, - sourceAttachementRootPath, - access, attrs, false); + IClasspathEntry entry = JavaCore.newLibraryEntry(entryPath,sourceAttachementPath,sourceAttachementRootPath,access, attrs, false); entries.add(entry); } } @@ -177,16 +157,18 @@ if (libDirectory != null) { libDirectory = new File(libDirectory, "lib"); //$NON-NLS-1$ } else { - // Tomcat adds portlet-api.jat automatically - /*File tomcatLib = new File(location, - IPortletConstants.TOMCAT_LIB); - if (tomcatLib != null && tomcatLib.isDirectory()) { - libDirectory = tomcatLib; - }*/ + libDirectory = getDirectory(location, + IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN); + if (libDirectory != null) { + libDirectory = new File(libDirectory, "lib"); //$NON-NLS-1$ + } else { + // Tomcat adds portlet-api.jar automatically + } } } } } + return libDirectory; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletFacetInstallDelegate.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -130,7 +130,6 @@ private void copyLibraries(IProgressMonitor monitor, IJavaProject javaProject, IDataModel config) { - // TODO Auto-generated method stub } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -1,6 +1,7 @@ package org.jboss.tools.portlet.core.internal.project.facet; import java.io.File; +import java.io.FileFilter; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; @@ -387,7 +388,7 @@ PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_the_examples_directory); return; } - File richFacesPortletZip = new File(examplesHome,"RichFacesPortlet.war"); //$NON-NLS-1$ + File richFacesPortletZip = getRichFacesExamples(examplesHome); if (!richFacesPortletZip.exists() || !richFacesPortletZip.isFile()) { PortletCoreActivator.log(null, Messages.PortletPostInstallListener_Cannot_find_the_RichFacesPortlet_war_file); return; @@ -442,6 +443,26 @@ } } + private File getRichFacesExamples(File examplesHome) { + File file = new File(examplesHome,"RichFacesPortlet.war"); //$NON-NLS-1$ + if (file.exists() && file.isFile()) { + return file; + } + File[] listFiles = examplesHome.listFiles(new FilenameFilter() { + + public boolean accept(File dir, String name) { + if (name.startsWith("seamPortlet") && name.endsWith(".war")) { //$NON-NLS-1$ //$NON-NLS-2$ + return true; + } + return false; + } + }); + if (listFiles.length > 0) { + return listFiles[0]; + } + return null; + } + private void deleteOldRichFacesApi(IContainer folder) throws CoreException { IResource[] members = folder.members(); for (int i = 0; i < members.length; i++) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/operations/AddPortletOperation.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -7,6 +7,7 @@ import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.CONFIGURE_GATEIN_PARAMETERS; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.EDIT_MODE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.HELP_MODE; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; @@ -39,13 +40,18 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jst.j2ee.internal.common.operations.NewJavaEEArtifactClassOperation; +import org.eclipse.jst.j2ee.model.IModelProvider; +import org.eclipse.jst.javaee.web.WebApp; +import org.eclipse.jst.javaee.web.WebAppVersionType; import org.eclipse.ui.dialogs.IOverwriteQuery; import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; @@ -59,7 +65,10 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML; +import org.jboss.tools.portlet.core.IJBossWebUtil; import org.jboss.tools.portlet.core.IPortletConstants; +import org.jboss.tools.portlet.core.JBossWebUtil; +import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.PortletCoreActivator; import org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties; import org.jboss.tools.portlet.ui.Messages; @@ -144,14 +153,17 @@ if (!isJSFPortlet && !isSeamPortlet) { return; } - boolean addJBossApp = model.getBooleanProperty(ADD_JBOSS_APP); - if (addJBossApp) { - updateJBossApp(aModel); + if (addPortlet) { + boolean addJBossApp = model.getBooleanProperty(ADD_JBOSS_APP); + if (addJBossApp) { + updateJBossApp(aModel); + } + boolean addJBossPortlet = model + .getBooleanProperty(ADD_JBOSS_PORTLET); + if (addJBossPortlet) { + updateJBossPortlet(aModel); + } } - boolean addJBossPortlet = model.getBooleanProperty(ADD_JBOSS_PORTLET); - if (addJBossPortlet) { - updateJBossPortlet(aModel); - } boolean copyJSFTemplates = model.getBooleanProperty(COPY_JSF_TEMPLATES); if (copyJSFTemplates) { @@ -161,8 +173,46 @@ PortletUIActivator.log(e); } } + boolean configureGateIn = model.getBooleanProperty(CONFIGURE_GATEIN_PARAMETERS); + if (configureGateIn) { + configureGateInParameters(aModel); + } } + private void configureGateInParameters(IDataModel aModel) { + final IProject project = getTargetProject(); + final IModelProvider provider = PortletCoreActivator + .getModelProvider(project); + IPath modelPath = new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$ //$NON-NLS-2$ + boolean exists = project.getProjectRelativePath().append(modelPath).toFile().exists(); + if (isWebApp25(provider.getModelObject()) && !exists) { + modelPath = IModelProvider.FORCESAVE; + } + provider.modify(new Runnable() { + public void run() { + IJBossWebUtil util = null; + + if (isWebApp25(provider.getModelObject())) { + util = new JBossWebUtil25(); + } else { + util = new JBossWebUtil(); + } + String name = "org.jboss.portletbridge.WRAP_SCRIPTS"; //$NON-NLS-1$ + String value = "true"; //$NON-NLS-1$ + String description = null; + util.configureContextParam(project, new NullProgressMonitor(), name, value, description); + + } + }, modelPath); + } + + private boolean isWebApp25(final Object webApp) { + if (webApp instanceof WebApp + && ((WebApp) webApp).getVersion() == WebAppVersionType._25_LITERAL) + return true; + return false; + } + private void updateJBossPortlet(IDataModel model) { IProject project = getTargetProject(); IVirtualComponent component = ComponentCore.createComponent(project); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/INewPortletClassDataModelProperties.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -58,4 +58,6 @@ static final String IS_SEAM_PORTLET = "NewPortletClassDataModel.IS_SEAM_PORTLET"; //$NON-NLS-1$ static final String COPY_JSF_TEMPLATES = "NewPortletClassDataModel.COPY_JSF_TEMPLATES"; //$NON-NLS-1$ + + static final String CONFIGURE_GATEIN_PARAMETERS = "NewPortletClassDataModel.CONFIGURE_GATEIN_PARAMETERS"; //$NON-NLS-1$ } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/IPortletUIConstants.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -73,6 +73,7 @@ static final String ADD_JBOSS_APP_LABEL = Messages.IPortletUIConstants_Create_JBoss_Application; static final String ADD_JBOSS_PORTLET_LABEL = Messages.IPortletUIConstants_Add_the_jboss_portlet_xml_file; static final String COPY_JSF_TEMPLATES_LABEL = Messages.IPortletUIConstants_Copy_JSF_Templates; + static final String CONFIGURE_GATEIN_PARAMETERS_LABEL = "Configure GateIn parameters"; } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -2,10 +2,14 @@ import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME; +import java.io.File; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -16,6 +20,9 @@ import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.server.core.IRuntime; +import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants; +import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.PortletCoreActivator; import org.osgi.framework.BundleContext; @@ -100,9 +107,69 @@ } } return false; - } + private static IPath getJBossConfigPath(IDataModel model) { + String projectName = model.getStringProperty(PROJECT_NAME); + if(projectName != null && !"".equals(projectName.trim())) { //$NON-NLS-1$ + IProject project = ProjectUtilities.getProject(projectName); + try { + IFacetedProject facetedProject = ProjectFacetsManager.create(project); + if (facetedProject != null) { + org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime = facetedProject.getPrimaryRuntime(); + if (facetRuntime == null) { + return null; + } + IRuntime runtime = PortletCoreActivator.getRuntime(facetRuntime); + if (runtime == null) { + return null; + } + IJBossServerRuntime jbossRuntime = (IJBossServerRuntime)runtime.loadAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); + if (jbossRuntime == null) { + return null; + } + IPath jbossLocation = runtime.getLocation(); + IPath configPath = jbossLocation.append(IJBossServerConstants.SERVER).append(jbossRuntime.getJBossConfiguration()); + return configPath; + } + } catch (CoreException e) { + PortletUIActivator.log(e); + } + } + return null; + } + + public static boolean isJBossPortalRuntime(IDataModel model) { + IPath configPath = getJBossConfigPath(model); + if (configPath == null) { + return false; + } + IPath portalPath = configPath.append(IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR); + File portalFile = portalPath.toFile(); + if (portalFile != null && portalFile.exists()) { + return true; + } + portalPath = configPath.append(IPortletConstants.SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR); + portalFile = portalPath.toFile(); + if (portalFile != null && portalFile.exists()) { + return true; + } + return false; + } + + public static boolean isGateIn(IDataModel model) { + IPath configPath = getJBossConfigPath(model); + if (configPath == null) { + return false; + } + IPath portalPath = configPath.append(IPortletConstants.SERVER_DEFAULT_DEPLOY_GATEIN); + File portalFile = portalPath.toFile(); + if (portalFile != null && portalFile.exists()) { + return true; + } + return false; + } + private static IProjectFacet getPortletFacet() { try { return ProjectFacetsManager.getProjectFacet(IPortletConstants.PORTLET_FACET_ID); Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -1,81 +1,56 @@ package org.jboss.tools.portlet.ui.internal.wizard; -import static org.eclipse.jst.j2ee.internal.web.operations.INewServletClassDataModelProperties.INIT_PARAM; -import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DESCRIPTION; -import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.DISPLAY_NAME; - import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.ADD_BUTTON_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.DESCRIPTION_TITLE; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.EDIT_BUTTON_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.INIT_PARAM_TITLE; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NAME_TITLE; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.NO_WEB_PROJECTS; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.REMOVE_BUTTON_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_LABEL; -import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.VALUE_TITLE; import static org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties.PROJECT_NAME; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_APP; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_PORTLET; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.CONFIGURE_GATEIN_PARAMETERS; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INITIAL_WINDOW_STATE; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INSTANCE_NAME; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.NAME; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.TITLE; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INSTANCE_NAME; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.WINDOW_NAME; +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.JBOSS_APP; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_NAME; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IF_EXISTS; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_PORTLET; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_APP; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.ADD_JBOSS_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PAGE_REGION; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PARENT_PORTAL; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.PORTLET_HEIGHT; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.INITIAL_WINDOW_STATE; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.JBOSS_APP; -import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.COPY_JSF_TEMPLATES; - +import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.WINDOW_NAME; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_APP_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_PORTLET_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_PORTLET_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.CONFIGURE_GATEIN_PARAMETERS_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.COPY_JSF_TEMPLATES_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.IF_EXISTS_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.INITIAL_WINDOW_STATE_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.INSTANCE_NAME_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.WINDOW_NAME_LABEL; +import static org.jboss.tools.portlet.ui.IPortletUIConstants.JBOSS_APP_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PAGE_NAME_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.IF_EXISTS_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PAGE_REGION_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PARENT_PORTAL_LABEL; import static org.jboss.tools.portlet.ui.IPortletUIConstants.PORTLET_HEIGHT_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.INITIAL_WINDOW_STATE_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.JBOSS_APP_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_APP_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_JBOSS_PORTLET_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.COPY_JSF_TEMPLATES_LABEL; -import static org.jboss.tools.portlet.ui.IPortletUIConstants.ADD_PORTLET_LABEL; - +import static org.jboss.tools.portlet.ui.IPortletUIConstants.WINDOW_NAME_LABEL; + import org.eclipse.core.runtime.IStatus; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jst.j2ee.internal.wizard.StringArrayTableWizardSection; -import org.eclipse.jst.servlet.ui.internal.wizard.StringArrayTableWizardSectionCallback; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.ModifyEvent; -import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; -import org.eclipse.wst.common.componentcore.internal.operation.IArtifactEditOperationDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.internal.datamodel.ui.DataModelWizardPage; import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonPlugin; -import org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties; import org.jboss.tools.portlet.ui.IPortletUIConstants; -import org.jboss.tools.portlet.ui.Messages; +import org.jboss.tools.portlet.ui.PortletUIActivator; /** * JBoss Portlet Wizard Setting Page @@ -84,6 +59,16 @@ */ public class AddJBossPortletWizardPage extends DataModelWizardPage { + private Combo ifExistsCombo; + private Text instanceNameText; + private Text pageNameText; + private Text windowNameText; + private Text parentReferenceText; + private Text regionText; + private Text heightText; + private Combo initialWindowStateCombo; + private Button addPortlet; + public AddJBossPortletWizardPage(IDataModel model, String pageName) { super(model, pageName); setDescription(IPortletUIConstants.ADD_JBOSS_PORTLET_WIZARD_PAGE_DESC); @@ -130,7 +115,10 @@ composite.setLayout(new GridLayout(2, false)); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - final Button addPortlet = new Button(composite,SWT.CHECK); + boolean isJBossPortal = PortletUIActivator.isJBossPortalRuntime(model); + model.setBooleanProperty(ADD_PORTLET, isJBossPortal); + + addPortlet = new Button(composite,SWT.CHECK); addPortlet.setText(ADD_PORTLET_LABEL); GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); gd.horizontalSpan = 2; @@ -141,7 +129,7 @@ Label ifExistsLabel = new Label(composite, SWT.LEFT); ifExistsLabel.setText(IF_EXISTS_LABEL); ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Combo ifExistsCombo = new Combo(composite,SWT.READ_ONLY); + ifExistsCombo = new Combo(composite,SWT.READ_ONLY); ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); ifExistsCombo.setItems(new String[] {"overwrite","keep"}); //$NON-NLS-1$ //$NON-NLS-2$ synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); @@ -150,7 +138,7 @@ Label instanceNameLabel = new Label(composite, SWT.LEFT); instanceNameLabel.setText(INSTANCE_NAME_LABEL); instanceNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text instanceNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + instanceNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); instanceNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(instanceNameText, INSTANCE_NAME, null); @@ -158,7 +146,7 @@ Label pageNameLabel = new Label(composite, SWT.LEFT); pageNameLabel.setText(PAGE_NAME_LABEL); pageNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text pageNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + pageNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); pageNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(pageNameText, PAGE_NAME, null); @@ -166,7 +154,7 @@ Label windowNameLabel = new Label(composite, SWT.LEFT); windowNameLabel.setText(WINDOW_NAME_LABEL); windowNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text windowNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + windowNameText = new Text(composite, SWT.SINGLE | SWT.BORDER); windowNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(windowNameText, WINDOW_NAME, null); @@ -174,7 +162,7 @@ Label parentReferenceLabel = new Label(composite, SWT.LEFT); parentReferenceLabel.setText(PARENT_PORTAL_LABEL); parentReferenceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text parentReferenceText = new Text(composite, SWT.SINGLE | SWT.BORDER); + parentReferenceText = new Text(composite, SWT.SINGLE | SWT.BORDER); parentReferenceText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(parentReferenceText, PARENT_PORTAL, null); @@ -182,7 +170,7 @@ Label regionLabel = new Label(composite, SWT.LEFT); regionLabel.setText(PAGE_REGION_LABEL); regionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text regionText = new Text(composite, SWT.SINGLE | SWT.BORDER); + regionText = new Text(composite, SWT.SINGLE | SWT.BORDER); regionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(regionText, PAGE_REGION, null); @@ -190,7 +178,7 @@ Label heightLabel = new Label(composite, SWT.LEFT); heightLabel.setText(PORTLET_HEIGHT_LABEL); heightLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Text heightText = new Text(composite, SWT.SINGLE | SWT.BORDER); + heightText = new Text(composite, SWT.SINGLE | SWT.BORDER); heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); synchHelper.synchText(heightText, PORTLET_HEIGHT, null); @@ -198,7 +186,7 @@ Label initialWindowStateLabel = new Label(composite, SWT.LEFT); initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING)); - final Combo initialWindowStateCombo = new Combo(composite,SWT.READ_ONLY); + initialWindowStateCombo = new Combo(composite,SWT.READ_ONLY); initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); initialWindowStateCombo.setItems(new String[] {"maximized","minimized","normal"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, null); @@ -206,15 +194,10 @@ addPortlet.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - boolean enable = addPortlet.getSelection(); - ifExistsCombo.setEnabled(enable); - instanceNameText.setEnabled(enable); - windowNameText.setEnabled(enable); - parentReferenceText.setEnabled(enable); - regionText.setEnabled(enable); - heightText.setEnabled(enable); + enableJBossProperties(); } }); + enableJBossProperties(); if (isJSFPortlet() || isSeamPortlet()) { final Button addJBossApp = new Button(composite, SWT.CHECK); @@ -241,6 +224,9 @@ } }); + addJBossApp.setSelection(isJBossPortal); + jbossAppText.setEnabled(addJBossApp.getSelection()); + final Button addJBossPortlet = new Button(composite, SWT.CHECK); addJBossPortlet.setText(ADD_JBOSS_PORTLET_LABEL); gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); @@ -254,6 +240,17 @@ gd.horizontalSpan = 2; copyJSFTemplates.setLayoutData(gd); synchHelper.synchCheckbox(copyJSFTemplates, COPY_JSF_TEMPLATES, null); + + boolean isGateIn = PortletUIActivator.isGateIn(model); + model.setBooleanProperty(CONFIGURE_GATEIN_PARAMETERS, isGateIn); + + final Button configureGateIn = new Button(composite, SWT.CHECK); + configureGateIn.setText(CONFIGURE_GATEIN_PARAMETERS_LABEL); + gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan = 2; + configureGateIn.setLayoutData(gd); + synchHelper.synchCheckbox(configureGateIn, CONFIGURE_GATEIN_PARAMETERS, null); + } } @@ -275,4 +272,16 @@ protected boolean isSeamPortlet() { return model.getBooleanProperty(IS_SEAM_PORTLET); } + + private void enableJBossProperties() { + boolean enable = addPortlet.getSelection(); + ifExistsCombo.setEnabled(enable); + instanceNameText.setEnabled(enable); + windowNameText.setEnabled(enable); + parentReferenceText.setEnabled(enable); + regionText.setEnabled(enable); + heightText.setEnabled(enable); + initialWindowStateCombo.setEnabled(enable); + pageNameText.setEnabled(enable); + } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2010-01-04 17:23:33 UTC (rev 19641) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2010-01-04 21:27:33 UTC (rev 19642) @@ -139,6 +139,7 @@ propertyNames.add(IS_JSF_PORTLET); propertyNames.add(IS_SEAM_PORTLET); propertyNames.add(COPY_JSF_TEMPLATES); + propertyNames.add(CONFIGURE_GATEIN_PARAMETERS); return propertyNames; } @@ -179,16 +180,19 @@ return Boolean.FALSE; } if (propertyName.equals(COPY_JSF_TEMPLATES)) { + return Boolean.TRUE; + } + if (propertyName.equals(CONFIGURE_GATEIN_PARAMETERS)) { return Boolean.FALSE; } if (propertyName.equals(ADD_PORTLET)) { return Boolean.TRUE; } if (propertyName.equals(ADD_JBOSS_APP)) { - return Boolean.TRUE; + return getBooleanProperty(ADD_PORTLET); } if (propertyName.equals(ADD_JBOSS_PORTLET)) { - return Boolean.TRUE; + return getBooleanProperty(ADD_PORTLET); } if (propertyName.equals(DO_VIEW)) { return Boolean.TRUE; Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml 2010-01-04 21:27:33 UTC (rev 19642) @@ -5,5 +5,15 @@ <prefix>seam-basic</prefix> <artifactId>seam-basic</artifactId> </plugin> + <plugin> + <name>RichFaces portlet archetype</name> + <prefix>richfaces-basic</prefix> + <artifactId>richfaces-basic</artifactId> + </plugin> + <plugin> + <name>JSF Portlet archetype</name> + <prefix>1.2-basic</prefix> + <artifactId>1.2-basic</artifactId> + </plugin> </plugins> </metadata> \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -3b20fa1f906699efe10222b196d81f18 \ No newline at end of file +47c7c499b5d968d5805dacd5c9729151 \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/maven-metadata.xml.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -538bdb181b289e60f87919e0a2eb297e97fdc1df \ No newline at end of file +38dd94ce08563958f571468cb3f0a37c5d61aba4 \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar =================================================================== (Binary files differ) Property changes on: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +b698d7db4ee7e49f23372f55bc1a8311 \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.jar.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +a474cc9b4ba0d7029da2b038acca54b7fbb1c28e \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1,36 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.portletbridge.archetypes</groupId> + <artifactId>seam-basic</artifactId> + <version>2.0.1.BETA</version> + <packaging>maven-archetype</packaging> + <name>Seam portlet archetype</name> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </extension> + </extensions> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </plugin> + </plugins> + </build> + + <distributionManagement> + <repository> + <id>internal.repo</id> + <name>JBoss Internal Repository</name> + <url>file:///e:/atest</url> + </repository> + </distributionManagement> + +</project> \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +5c0db171183cb1565e98f0fe7543b4ae \ No newline at end of file Added: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 (rev 0) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/2.0.1.BETA/seam-basic-2.0.1.BETA.pom.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -0,0 +1 @@ +7f22e8b42eb601705c7900b479bc2971d2e9435b \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml 2010-01-04 21:27:33 UTC (rev 19642) @@ -3,10 +3,11 @@ <artifactId>seam-basic</artifactId> <version>2.0.0.BETA</version> <versioning> - <latest>2.0.0.BETA</latest> + <latest>2.0.1.BETA</latest> <versions> <version>2.0.0.BETA</version> + <version>2.0.1.BETA</version> </versions> - <lastUpdated>20091111151325</lastUpdated> + <lastUpdated>20100104212258</lastUpdated> </versioning> </metadata> \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.md5 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -72dee3ddb9610e4297a72f7274f53414 \ No newline at end of file +a6069977184d06af35f7d6ddab2ff68f \ No newline at end of file Modified: workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 =================================================================== --- workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 2010-01-04 17:23:33 UTC (rev 19641) +++ workspace/snjeza/archetypes/org/jboss/portletbridge/archetypes/seam-basic/maven-metadata.xml.sha1 2010-01-04 21:27:33 UTC (rev 19642) @@ -1 +1 @@ -991c2c38f3d70ab1bbfcc6ce7c80bbc92af4d2dc \ No newline at end of file +15e9c88f8f3a47b76e0a2df6eff55c6487ee71b7 \ No newline at end of file