Author: linsun
Date: Wed Sep 26 12:04:16 2007
New Revision: 579758
URL: http://svn.apache.org/viewvc?rev=579758&view=rev
Log:
These changes seem to fix GERONIMODEVTOOLS-224 on my machine (with a
clean .m2 repo).
Modified:
geronimo/devtools/j2g/trunk/eclipse/eclipse-3.3.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.j2g.resources/test-apps/security/security-geronimo-plan.xml
Modified: geronimo/devtools/j2g/trunk/eclipse/eclipse-3.3.xml
URL:
http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/eclipse/eclipse-3.3.xml?rev=579758&r1=579757&r2=579758&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/eclipse/eclipse-3.3.xml (original)
+++ geronimo/devtools/j2g/trunk/eclipse/eclipse-3.3.xml Wed Sep 26
12:04:16 2007
@@ -23,7 +23,7 @@
<target name="init">
<property name="eclipse_version" value="3.3"/>
- <echo>Setting up for downloading Eclipse SDK
v${eclipse_version}, WTP, EMF, GEF and DTP</echo>
+ <echo>Setting up for downloading Eclipse SDK
v${eclipse_version}</echo>
<property name="base_url"
value="http://www.eclipse.org/downloads/download.php?file="/>
<property name="eclipse_sdk_url"
value="${base_url}/eclipse/downloads/drops/R-3.3-200706251500/"/>
<property name="eclipse_sdk_win32"
value="eclipse-SDK-${eclipse_version}-win32.zip"/>
@@ -32,15 +32,6 @@
<property name="eclipse_sdk_linux_gz"
value="${eclipse_sdk_linux}.gz"/>
<property name="eclipse_sdk_macos_gz"
value="${eclipse_sdk_macos}.gz"/>
- <property name="dtp_download_url"
value="${base_url}/datatools/downloads/1.5/"/>
- <property name="emf_download_url"
value="${base_url}/modeling/emf/emf/downloads/drops/2.3.0/R200706262000/"/>
- <property name="gef_download_url"
value="${base_url}/tools/gef/downloads/drops/R-3.3-200706281000/"/>
- <property name="wtp_download_url"
value="${base_url}/webtools/downloads/drops/R2.0/R-2.0-200706260303/"/>
-
- <property name="dtp_sdk" value="dtp-sdk_1.5_20070704.zip"/>
- <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.0.zip"/>
- <property name="gef_sdk" value="GEF-SDK-3.3.zip"/>
- <property name="wtp_sdk"
value="wtp-sdk-R-2.0-200706260303.zip"/>
<property name="protocol" value="&r=1&protocol=http"/>
</target>
@@ -89,62 +80,5 @@
<echo>Removing any existing version of Eclipse at
${LOCAL_M2_REPO}/eclipse</echo>
<delete dir="${LOCAL_M2_REPO}/eclipse"/>
<echo>Downloading WTP prereqs....</echo>
- <antcall target="dtp"/>
- <antcall target="emf"/> - <antcall target="gef"/>
- <antcall target="wtp"/> - </target>
-
- <target name="dtp" depends="init" description="Download Data
Tools Platform (DTP) artifact">
- <echo>Downloading ${dtp_download_url}${dtp_sdk}</echo>
- <mkdir
dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}"/>
- <get src="${dtp_download_url}${dtp_sdk}${protocol}"
-
dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${dtp_sdk}"
- verbose="true"
- usetimestamp="true"/>
- <echo>Unzipping ${dtp_sdk} to the expected location in
${LOCAL_M2_REPO}</echo>
- <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <unzip
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${dtp_sdk}"
- dest="${LOCAL_M2_REPO}/eclipse"/>
- </target>
-
- <target name="emf" depends="init" description="Download Eclipse
Modeling Framework (EMF) artifact">
- <echo>Downloading ${emf_download_url}${emf_sdo}</echo>
- <mkdir
dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}"/>
- <get src="${emf_download_url}${emf_sdo}${protocol}"
-
dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${emf_sdo}"
- verbose="true"
- usetimestamp="true"/>
- <echo>Unzipping ${emf_sdo} to the expected location in
${LOCAL_M2_REPO}</echo>
- <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <unzip
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${emf_sdo}"
- dest="${LOCAL_M2_REPO}/eclipse"/>
</target>
-
- <target name="gef" depends="init" description="Download Graphical
Editing Framework (GEF) artifact">
- <echo>Downloading ${gef_download_url}${gef_sdk}</echo>
- <mkdir
dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}"/>
- <get src="${gef_download_url}${gef_sdk}${protocol}"
-
dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${gef_sdk}"
- verbose="true"
- usetimestamp="true"/>
- <echo>Unzipping ${gef_sdk} to the expected location in
${LOCAL_M2_REPO}</echo>
- <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <unzip
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${gef_sdk}"
- dest="${LOCAL_M2_REPO}/eclipse"/>
- </target>
-
- <target name="wtp" depends="init" description="Download Web Tools
Platform (WTP) artifact">
- <echo>Downloading ${wtp_download_url}${wtp_sdk}</echo>
- <mkdir
dir="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}"/>
- <get src="${wtp_download_url}${wtp_sdk}${protocol}"
-
dest="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${wtp_sdk}"
- verbose="true"
- usetimestamp="true"/>
- <echo>Unzipping ${wtp_sdk} to the expected location in
${LOCAL_M2_REPO}</echo>
- <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <unzip
src="${LOCAL_M2_REPO}/org/eclipse/eclipse/${eclipse_version}/${wtp_sdk}"
- dest="${LOCAL_M2_REPO}/eclipse"/>
- </target>
-
</project>
Modified:
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.j2g.resources/test-apps/security/security-geronimo-plan.xml
URL:
http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.j2g.resources/test-apps/security/security-geronimo-plan.xml?rev=579758&r1=579757&r2=579758&view=diff
==============================================================================
---
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.j2g.resources/test-apps/security/security-geronimo-plan.xml
(original)
+++
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.j2g.resources/test-apps/security/security-geronimo-plan.xml
Wed Sep 26 12:04:16 2007
@@ -28,7 +28,7 @@
<log:login-module control-flag="REQUIRED" server-side="true"
wrap-principals="false">
<log:login-domain-name>jbossmq</log:login-domain-name>
<log:login-module-class>org.apache.geronimo.security.realm.providers.SQLLoginModule</log:login-module-class>
- <log:option name="dataSourceName">DefaultDS/Test</log:option>
+ <log:option
name="dataSourceName">java:/DefaultDS/Test</log:option>
<log:option name="userSelect">SELECT PASSWD FROM JMS_USERS
WHERE USERID=?</log:option>
<log:option name="groupSelect">SELECT ROLEID, 'Roles' FROM
JMS_ROLES WHERE USERID=?</log:option>
</log:login-module>