1:09 p.m.
Author: manaRH
Date: 2012-10-12 14:09:04 -0400 (Fri, 12 Oct 2012)
New Revision: 15289
Removed:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch
Modified:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
Log:
removed unsupported things like glassfish and icefaces
Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-10-12 18:08:56 UTC (rev
15288)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-10-12 18:09:04 UTC (rev
15289)
@@ -30,10 +30,6 @@
<condition property="jboss.home" value="${env.JBOSS_HOME}"
else="C:/Program Files/jboss-as-7.1.1.Final">
<isset property="env.JBOSS_HOME"/>
</condition>
- <condition property="glassfish.home"
value="${env.GLASSFISH_HOME}" else="C:/Program
Files/glassfish-v2.1">
- <isset property="env.GLASSFISH_HOME"/>
- </condition>
- <property name="glassfish.domain" value="domain1"/>
<condition property="workspace.home" value="C:/Projects"
else="${user.home}/projects">
<os family="windows"/>
</condition>
@@ -180,9 +176,6 @@
<filter token="testPackage"
value="${test.package}"/>
<filter token="deploymentType"
value="${project.type}"/>
<filter token="jbossHome" value="${jboss.home}"/>
- <filter token="glassfishHome"
value="${glassfish.home}"/>
- <filter token="glassfishDomain"
value="${glassfish.domain}"/>
- <filter token="iceHome" value="${icefaces.home}"/>
<filter token="hbm2ddl"
value="${hibernate.hbm2ddl.auto}"/>
<filter token="driverJar" value="${driver.file}"/>
<filter token="skin" value="${richfaces.skin}"/>
@@ -233,17 +226,6 @@
defaultvalue="${old.jboss.home}"/>
<pathFixer property="jboss.home.new"/>
- <property name="old.glassfish.home"
value="${glassfish.home}"/>
- <input addproperty="glassfish.home.new"
- message="Enter your GlassFish V2 or V3 home directory (Ignore if
you aren't deploying to GlassFish) [${old.glassfish.home}]"
- defaultvalue="${old.glassfish.home}"/>
- <pathFixer property="glassfish.home.new"/>
-
- <property name="old.glassfish.domain"
value="${glassfish.domain}"/>
- <input addproperty="glassfish.domain.new"
- message="Enter your GlassFish domain (Ignore if you aren't
deploying to GlassFish) [${old.glassfish.domain}]"
- defaultvalue="${old.glassfish.domain}"/>
-
<property name="old.project.name" value="myproject"/>
<input addproperty="project.name.new"
message="Enter the project name [${old.project.name}]"
@@ -251,21 +233,6 @@
<normalizeProjectName property="project.name.new"/>
<echo message="Accepted project name as: ${project.name.new}"/>
-<!-- <property name="old.icefaces" value="n"/>
- <input addproperty="icefaces.new"
- message="Do you want to use ICEfaces instead of RichFaces?
[${old.icefaces}]"
- validargs="y,n"
- defaultvalue="${old.icefaces}"/>
-
- <condition property="icefaces.home.new" value="">
- <equals arg1="${icefaces.new}" arg2="n"/>
- </condition>
-
- <property name="old.icefaces.home" value=""/>
- <input addproperty="icefaces.home.new"
- message="By default, seam-gen will download the recommended
ICEfaces. If you want to use a specific version of ICEfaces, enter the path to ICEfaces
[${old.icefaces.home}]"
- defaultvalue="${old.icefaces.home}"/>
--->
<condition property="richfaces.skin.new" value="">
<equals arg1="${icefaces.new}" arg2="y"/>
</condition>
@@ -568,8 +535,6 @@
<entry key="richfaces.skin"
value="${richfaces.skin.new}"/>
<entry key="project.type"
value="${project.type.new}"/>
<entry key="jboss.home"
value="${jboss.home.new}"/>
- <entry key="glassfish.home"
value="${glassfish.home.new}"/>
- <entry key="glassfish.domain"
value="${glassfish.domain.new}"/>
<entry key="icefaces" value="${icefaces.new}"/>
<entry key="icefaces.home"
value="${icefaces.home.new}"/>
<entry key="action.package"
value="${action.package.new}"/>
@@ -836,7 +801,6 @@
<echo message="Copying build scripts for WAR deployment to the
${project.home} directory..."/>
<copy todir="${project.home}">
<fileset dir="${templates.dir}/build-scripts">
- <include name="glassfish-build.xml"/>
<include name="build-war.xml"/>
</fileset>
<filterset refid="project"/>
@@ -879,7 +843,6 @@
<copy todir="${project.home}">
<fileset dir="${templates.dir}/build-scripts">
<include name="build.xml"/>
- <include name="glassfish-build.xml"/>
</fileset>
<filterset refid="project"/>
<filterset refid="jdbc"/>
@@ -926,7 +889,6 @@
<copy todir="${project.home}/resources">
<fileset dir="${templates.dir}/resources/">
<exclude name="datasource-ds.xml"/>
- <exclude name="glassfish-resources.xml"/>
<exclude name="import.sql"/>
<exclude name="components-*.properties"/>
<exclude name="WEB-INF/components*.xml"/>
@@ -1005,11 +967,6 @@
<filterset refid="project"/>
</copy>
- <copy
tofile="${project.home}/debug-glassfish-${project.name}.launch"
-
file="${templates.dir}/ide-project-files/eclipse/debug-glassfish.launch">
- <filterset refid="project"/>
- </copy>
-
<copy tofile="${project.home}/${project.name}.launch"
file="${templates.dir}/hibernatetools/hibernate-console.launch">
<filterset refid="project"/>
@@ -1070,18 +1027,6 @@
<replacevalue><![CDATA[<use-java-context>false</use-java-context>]]></replacevalue>
</replace>
- <copy
tofile="${project.home}/resources/glassfish-resources-dev.xml"
- file="${templates.dir}/resources/glassfish-resources.xml">
- <filterset refid="project"/>
- <filterset refid="jdbc"/>
- </copy>
-
- <copy
tofile="${project.home}/resources/glassfish-resources-prod.xml"
- file="${templates.dir}/resources/glassfish-resources.xml">
- <filterset refid="project"/>
- <filterset refid="jdbc"/>
- </copy>
-
<copy tofile="${project.home}/resources/import-dev.sql"
file="${templates.dir}/resources/import.sql">
<filterset refid="project"/>
@@ -1142,8 +1087,6 @@
<filterset refid="project"/>
</copy>
- <copy todir="${project.home}"
file="${templates.dir}/build-scripts/glassfish-readme.txt"/>
-
<mkdir dir="${project.home}/src/${model.dir}"/>
<mkdir dir="${project.home}/src/${action.dir}"/>
<mkdir dir="${project.home}/src/${test.dir}"/>
@@ -1741,7 +1684,6 @@
<target name="settings" depends="validate-project"
description="Print the settings">
<echo message="JBoss AS home: ${jboss.home}"/>
- <echo message="GlassFish home: ${glassfish.home}"/>
<echo message="Project name: ${project.name}"/>
<echo message="Project location:
${workspace.home}/${project.name}"/>
<echo message="Project type: ${project.type}"/>
Deleted:
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch
===================================================================
---
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch 2012-10-12
18:08:56 UTC (rev 15288)
+++
branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch 2012-10-12
18:09:04 UTC (rev 15289)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"
standalone="no"?>
-<launchConfiguration
type="org.eclipse.jdt.launching.remoteJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/@projectName@"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE"
value="true"/>
-<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP">
-<mapEntry key="port" value="9009"/>
-<mapEntry key="hostname" value="localhost"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR"
value="@projectName@"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID"
value="org.eclipse.jdt.launching.socketAttachConnector"/>
-</launchConfiguration>