[jbosstools-commits] JBoss Tools SVN: r40739 - in trunk/seam/plugins/org.jboss.tools.seam.core: src/org/jboss/tools/seam/internal/core/project/facet and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2012-05-02 21:02:02 -0400 (Wed, 02 May 2012)
New Revision: 40739

Added:
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
Modified:
   trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
   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/SeamProjectCreator.java
Log:
https://issues.jboss.org/browse/JBIDE-11490 fixed -ds.xml

Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml	2012-05-03 00:04:05 UTC (rev 40738)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml	2012-05-03 01:02:02 UTC (rev 40739)
@@ -249,7 +249,7 @@
             type="install"
             version="2.3">
          <delegate
-               class="org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate">
+               class="org.jboss.tools.seam.internal.core.project.facet.Seam23FacetInstallDelegate">
          </delegate>
          <config-factory
                class="org.jboss.tools.seam.internal.core.project.facet.SeamFacetInstallDataModelProvider">

Added: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java	                        (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java	2012-05-03 01:02:02 UTC (rev 40739)
@@ -0,0 +1,45 @@
+/******************************************************************************* 
+ * Copyright (c) 2012 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.seam.internal.core.project.facet;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.datatools.connectivity.IConnectionProfile;
+import org.eclipse.datatools.connectivity.ProfileManager;
+import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
+import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
+
+/**
+ * @author Alexey Kazakov
+ */
+public class Seam23FacetInstallDelegate extends Seam2FacetInstallDelegate {
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.jboss.tools.seam.internal.core.project.facet.Seam2FacetInstallDelegate#copyFilesToWarProject(org.eclipse.core.resources.IProject, org.eclipse.wst.common.project.facet.core.IProjectFacetVersion, org.eclipse.wst.common.frameworks.datamodel.IDataModel, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	@Override
+	protected void copyFilesToWarProject(IProject project, IProjectFacetVersion fv, IDataModel model, IProgressMonitor monitor) throws CoreException {
+		super.copyFilesToWarProject(project, fv, model, monitor);
+		if(!shouldCopyLibrariesAndTemplates(model)) {
+			return;
+		}
+		if(isWarConfiguration(model)) {
+			
+		}
+	}
+
+	protected static void copyDBDriverToProject() {
+		String connectionProfileName = null;
+		IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(connectionProfileName.toString());
+	}
+}
\ No newline at end of file


Property changes on: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam23FacetInstallDelegate.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

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	2012-05-03 00:04:05 UTC (rev 40738)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java	2012-05-03 01:02:02 UTC (rev 40739)
@@ -878,6 +878,7 @@
 			if (model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH) != null) {
 				File driver = new File(((String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH))[0]);
 				ejbFilterSet.addFilter("driverJar", " " + driver.getName() + "\n"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				viewFilterSetCollection.addFilterSet(getDriverFilterSet(model));
 			} else {
 				ejbFilterSet.addFilter("driverJar", ""); //$NON-NLS-1$ //$NON-NLS-2$
 			}
@@ -906,6 +907,16 @@
 		project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
 	}
 
+	public static FilterSet getDriverFilterSet(IDataModel model) {
+		if (model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH) != null) {
+			File driver = new File(((String[]) model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH))[0]);
+			FilterSet dbTypeFilterSet = new FilterSet();
+			dbTypeFilterSet.addFilter("database.type", driver.getName());
+			return dbTypeFilterSet;
+		}
+		return null;
+	}
+
 	private void initDefaultModelValues(IDataModel model, boolean warProject) {
 		if(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)==null) {
 			model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, warProject?ISeamFacetDataModelProperties.DEPLOY_AS_WAR:ISeamFacetDataModelProperties.DEPLOY_AS_EAR);

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	2012-05-03 00:04:05 UTC (rev 40738)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamProjectCreator.java	2012-05-03 01:02:02 UTC (rev 40739)
@@ -35,6 +35,7 @@
 import org.eclipse.core.runtime.preferences.IScopeContext;
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.debug.core.model.IFilteredStep;
 import org.eclipse.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
@@ -190,6 +191,11 @@
 		viewFilterSetCollection.addFilterSet(jdbcFilterSet);
 		viewFilterSetCollection.addFilterSet(projectFilterSet);
 
+		FilterSet driverSet = SeamFacetAbstractInstallDelegate.getDriverFilterSet(model);
+		if(driverSet!=null) {
+			viewFilterSetCollection.addFilterSet(driverSet);
+		}
+
 		hibernateDialectFilterSet = new FilterSetCollection();
 		hibernateDialectFilterSet.addFilterSet(encodedJdbcFilterSet);
 		hibernateDialectFilterSet.addFilterSet(encodedProjectFilterSet);