February 2010 - jbosstools-commits

JBoss Tools SVN: r20159 - trunk/common/releng/hudson.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-05 16:00:11 -0500 (Fri, 05 Feb 2010) New Revision: 20159 Modified: trunk/common/releng/hudson/run.sh Log: check in path AND in using whereis (fixed) Modified: trunk/common/releng/hudson/run.sh =================================================================== --- trunk/common/releng/hudson/run.sh 2010-02-05 20:54:17 UTC (rev 20158) +++ trunk/common/releng/hudson/run.sh 2010-02-05 21:00:11 UTC (rev 20159) @@ -32,16 +32,16 @@ # check for required platform stuff missingRequirements="" for f in cvs svn javac wget vncserver Xvfb Xvnc; do - check=$(${f} 2>&1); + check=$(${f} 2>&1 &); check2=$(whereis $f); if [[ ${check%%command not found} != ${check} ]]; then # not found if [[ $check2 == "$f:" ]]; then # not found missingRequirements="$missingRequirements $f" else - echo "Found $check" + echo "Found $check2" fi else - echo "Found $f on in PATH=" + echo "Found $f in PATH=" echo ${PATH}; fi done

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20158 - in trunk: maven/features/org.jboss.tools.maven.feature and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-05 15:54:17 -0500 (Fri, 05 Feb 2010) New Revision: 20158 Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.properties trunk/birt/features/org.jboss.tools.birt.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.feature/feature.xml Log: remove link to update sites and discovery sites - not required Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.properties =================================================================== --- trunk/birt/features/org.jboss.tools.birt.feature/feature.properties 2010-02-05 20:49:24 UTC (rev 20157) +++ trunk/birt/features/org.jboss.tools.birt.feature/feature.properties 2010-02-05 20:54:17 UTC (rev 20158) @@ -22,7 +22,6 @@ # "updateSiteName" property - label for the update site updateSiteName=JBossTools Update Site -birtUpdateSiteName=Business Intelligence and Reporting Tools (BIRT) Updates # "description" property - description of the feature description=JBoss BIRT Integration Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml =================================================================== --- trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) +++ trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-02-05 20:54:17 UTC (rev 20158) @@ -18,11 +18,12 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - <discovery label="%birtUpdateSiteName" url="http://download.eclipse.org/birt/update-site/2.3"/> - </url> - +  +  <requires> <import feature="org.eclipse.birt" version="2.3.1"/> <import feature="org.eclipse.birt.integration.wtp" version="2.3.1"/> Modified: trunk/maven/features/org.jboss.tools.maven.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) +++ trunk/maven/features/org.jboss.tools.maven.feature/feature.xml 2010-02-05 20:54:17 UTC (rev 20158) @@ -18,9 +18,12 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  +  <plugin id="org.jboss.tools.maven.core"

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20157 - in trunk: as/features/org.jboss.ide.eclipse.as.feature and 36 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-05 15:49:24 -0500 (Fri, 05 Feb 2010) New Revision: 20157 Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml trunk/bpel/features/org.jboss.tools.bpel.sdk.feature/feature.xml trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml trunk/common/features/org.jboss.tools.common.all.feature/feature.xml trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml trunk/common/features/org.jboss.tools.common.core.feature/feature.xml trunk/common/features/org.jboss.tools.common.feature/feature.xml trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml trunk/esb/features/org.jboss.tools.esb.feature/feature.xml trunk/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml trunk/examples/features/org.jboss.tools.project.examples.feature/feature.xml trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.sdk.feature/feature.xml trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/feature.xml trunk/jmx/features/org.jboss.tools.jmx.tests.feature/feature.xml trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.sdk.feature/feature.xml trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml trunk/seam/features/org.jboss.tools.seam.feature/feature.xml trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml trunk/struts/features/org.jboss.tools.struts.feature/feature.xml trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml trunk/ws/features/org.jboss.tools.ws.feature/feature.xml Log: remove link to update site - not required Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml =================================================================== --- trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/archives/features/org.jboss.ide.eclipse.archives.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <requires> <import plugin="org.apache.ant"/> Modified: trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml =================================================================== --- trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -24,9 +24,9 @@ Raleigh NC 27606 USA. </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <requires> <import plugin="org.eclipse.core.runtime"/> Modified: trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml =================================================================== --- trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/bpel/features/org.jboss.tools.bpel.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <requires> <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/> Modified: trunk/bpel/features/org.jboss.tools.bpel.sdk.feature/feature.xml =================================================================== --- trunk/bpel/features/org.jboss.tools.bpel.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/bpel/features/org.jboss.tools.bpel.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -20,10 +20,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <includes id="org.jboss.tools.bpel.feature" version="0.0.0"/> Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml =================================================================== --- trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,10 +18,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <requires> <import plugin="org.junit" version="3.8.1" match="compatible"/> <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/> Modified: trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml =================================================================== --- trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/cdi/features/org.jboss.tools.cdi.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -21,9 +21,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> +  <requires> <import feature="org.jboss.tools.richfaces.feature" version="3.1.0" match="greaterOrEqual"/> Modified: trunk/common/features/org.jboss.tools.common.all.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.all.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -20,9 +20,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <includes id="org.jboss.tools.common.core.feature" Modified: trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.all.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -20,10 +20,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <includes id="org.jboss.tools.common.all.feature" version="0.0.0"/> Modified: trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.all.tests.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,10 +18,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <requires> <import plugin="org.junit" version="3.8.1" match="greaterOrEqual"/> <import plugin="org.eclipse.core.runtime" version="3.3.0" match="greaterOrEqual"/> Modified: trunk/common/features/org.jboss.tools.common.core.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.core.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -23,9 +23,9 @@ Raleigh NC 27606 USA. </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.tools.common" Modified: trunk/common/features/org.jboss.tools.common.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -24,7 +24,7 @@ <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <includes Modified: trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.text.ext.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -24,7 +24,7 @@ <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <requires> Modified: trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml =================================================================== --- trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/common/features/org.jboss.tools.common.verification.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -23,9 +23,9 @@ </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.tools.common.verification" Modified: trunk/esb/features/org.jboss.tools.esb.feature/feature.xml =================================================================== --- trunk/esb/features/org.jboss.tools.esb.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/esb/features/org.jboss.tools.esb.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.tools.esb.core" Modified: trunk/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml =================================================================== --- trunk/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/examples/features/org.jboss.tools.community.project.examples.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.tools.community.project.examples" Modified: trunk/examples/features/org.jboss.tools.project.examples.feature/feature.xml =================================================================== --- trunk/examples/features/org.jboss.tools.project.examples.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/examples/features/org.jboss.tools.project.examples.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.tools.project.examples" Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml =================================================================== --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.ide.eclipse.freemarker" Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.sdk.feature/feature.xml =================================================================== --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,10 +18,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <includes id="org.jboss.ide.eclipse.freemarker.feature" version="0.0.0"/> Modified: trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, Raleigh NC 27606 USA. </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <requires> <import plugin="org.eclipse.core.runtime" version="0.0.0" match="greaterOrEqual"/> Modified: trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml =================================================================== --- trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/hibernatetools/features/org.hibernate.eclipse.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -20,11 +20,6 @@ </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - - <includes id="org.hibernate.eclipse.feature" version="0.0.0"/> Modified: trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <plugin id="org.jboss.tools.jbpm.convert" Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jbpm/features/org.jboss.tools.jbpm3.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -17,9 +17,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <includes id="org.jboss.tools.jbpm.common.feature" Modified: trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jbpm/features/org.jboss.tools.jbpm3.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -17,10 +17,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - <includes id="org.jboss.tools.jbpm.common.feature" version="0.0.0"/> Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jbpm/features/org.jboss.tools.jbpm4.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -17,9 +17,9 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <includes id="org.jboss.tools.jbpm.common.feature" Modified: trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml =================================================================== --- trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jbpm/features/org.jboss.tools.jbpm4.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -17,10 +17,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - <includes id="org.jboss.tools.jbpm4.feature" version="0.0.0"/> Modified: trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml =================================================================== --- trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jmx/features/org.jboss.tools.jmx.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -22,11 +22,11 @@ %license </license> +  +  Modified: trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/feature.xml =================================================================== --- trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jmx/features/org.jboss.tools.jmx.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -20,10 +20,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <includes id="org.jboss.tools.jmx.feature" version="0.0.0"/> Modified: trunk/jmx/features/org.jboss.tools.jmx.tests.feature/feature.xml =================================================================== --- trunk/jmx/features/org.jboss.tools.jmx.tests.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jmx/features/org.jboss.tools.jmx.tests.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,10 +18,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/"/> - </url> - <requires> <import plugin="org.junit" version="3.8.1" match="compatible"/> <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/> Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml =================================================================== --- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,9 +18,9 @@ Red Hat, Inc. licenses these features and plugins to you under certain open source licenses (or aggregations of such licenses), which in a particular case may include the Eclipse Public License, the GNU Lesser General Public License, and/or certain other open source licenses. For precise licensing details, consult the corresponding source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, Raleigh NC 27606 USA. </license> - <url> - <update label="JBossTools Update Site" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> +  <requires> <import feature="org.jboss.tools.xulrunner.feature" version="1.8.1.3-20070904"/> Modified: trunk/maven/features/org.jboss.tools.maven.sdk.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.sdk.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/maven/features/org.jboss.tools.maven.sdk.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -17,10 +17,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - <includes id="org.jboss.tools.maven.feature" version="0.0.0"/> Modified: trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml =================================================================== --- trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/maven/features/org.jboss.tools.maven.seam.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,10 +18,6 @@ %license </license> - <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - </url> - <plugin id="org.jboss.tools.maven.seam" download-size="0" Modified: trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml =================================================================== --- trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -19,7 +19,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <plugin Modified: trunk/seam/features/org.jboss.tools.seam.feature/feature.xml =================================================================== --- trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/seam/features/org.jboss.tools.seam.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -19,7 +19,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <requires> Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml =================================================================== --- trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/smooks/features/org.jboss.tools.smooks.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -19,7 +19,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <plugin Modified: trunk/struts/features/org.jboss.tools.struts.feature/feature.xml =================================================================== --- trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/struts/features/org.jboss.tools.struts.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -19,7 +19,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <plugin Modified: trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml =================================================================== --- trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/tptp/features/org.jboss.tools.tptp.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -18,7 +18,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <requires> Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml =================================================================== --- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -19,8 +19,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> - <discovery label="%discoverySiteName" url="http://download.jboss.org/jbosstools/updates/development"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <plugin Modified: trunk/ws/features/org.jboss.tools.ws.feature/feature.xml =================================================================== --- trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2010-02-05 20:34:30 UTC (rev 20156) +++ trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2010-02-05 20:49:24 UTC (rev 20157) @@ -19,7 +19,7 @@ </license> <url> - <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/> + <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable/galileo/"/> </url> <plugin

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20156 - trunk/common/releng/hudson.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2010-02-05 15:34:30 -0500 (Fri, 05 Feb 2010) New Revision: 20156 Modified: trunk/common/releng/hudson/run.sh Log: check in path AND in using whereis Modified: trunk/common/releng/hudson/run.sh =================================================================== --- trunk/common/releng/hudson/run.sh 2010-02-05 19:45:52 UTC (rev 20155) +++ trunk/common/releng/hudson/run.sh 2010-02-05 20:34:30 UTC (rev 20156) @@ -32,11 +32,17 @@ # check for required platform stuff missingRequirements="" for f in cvs svn javac wget vncserver Xvfb Xvnc; do - check=$(whereis $f); - if [[ $check == "$f:" ]]; then - missingRequirements="$missingRequirements $f" + check=$(${f} 2>&1); + check2=$(whereis $f); + if [[ ${check%%command not found} != ${check} ]]; then # not found + if [[ $check2 == "$f:" ]]; then # not found + missingRequirements="$missingRequirements $f" + else + echo "Found $check" + fi else - echo "Found $check" + echo "Found $f on in PATH=" + echo ${PATH}; fi done if [[ $missingRequirements ]]; then

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20155 - branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/res/project/lib.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-02-05 14:45:52 -0500 (Fri, 05 Feb 2010) New Revision: 20155 Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/res/project/lib/ejb3-persistence.jar branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/res/project/lib/hibernate3.jar Log: https://jira.jboss.org/jira/browse/JBIDE-5706 - update junit test lib jars Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/res/project/lib/ejb3-persistence.jar =================================================================== (Binary files differ) Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/res/project/lib/hibernate3.jar =================================================================== (Binary files differ)

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20154 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2010-02-05 13:14:41 -0500 (Fri, 05 Feb 2010) New Revision: 20154 Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java Log: JBIDE-5798: Code completion for attributes: String proposals should be higher than EL ones. Issue is fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-02-05 17:58:14 UTC (rev 20153) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/contentassist/XmlContentAssistProcessor.java 2010-02-05 18:14:41 UTC (rev 20154) @@ -307,7 +307,7 @@ if (query == null) query = ""; //$NON-NLS-1$ String stringQuery = matchString; - int relevanceShift = 0; + int relevanceShift = -2; // Fix for JBIDE-5987: Relevance for predicate proposals is shifted down by default to show EL proposals lower than attr-value proposals if (shiftRelevanceAgainstTagNameProposals) { relevanceShift += prefix.getText() != null && prefix.getText().trim().length() > 0 ? (XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION - baseRelevance + 2): -2; } @@ -348,7 +348,7 @@ String additionalProposalInfo = (textProposal.getContextInfo() == null ? "" : textProposal.getContextInfo()); //$NON-NLS-1$ int relevance = textProposal.getRelevance(); if (relevance == TextProposal.R_NONE) { - relevance = baseRelevance; + relevance = baseRelevance; } relevance += relevanceShift;

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20153 - in branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins: org.hibernate.eclipse.console.test and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-02-05 12:58:14 -0500 (Fri, 05 Feb 2010) New Revision: 20153 Added: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java Removed: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/.classpath Log: https://jira.jboss.org/jira/browse/JBIDE-5706 - update tests Copied: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test (from rev 20055, trunk/hibernatetools/tests/org.hibernate.eclipse.console.test) Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/.classpath =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/.classpath 2010-02-01 16:24:38 UTC (rev 20055) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/.classpath 2010-02-05 17:58:14 UTC (rev 20153) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> + <classpathentry exported="true" kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src"/> <classpathentry exported="true" kind="lib" path="lib/hibernate-tools-tests.jar"/> <classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/> @@ -17,5 +17,6 @@ <classpathentry exported="true" kind="lib" path="lib/jmock-2.5.1/jmock-legacy-2.5.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jmock-2.5.1/jmock-script-2.5.1.jar"/> <classpathentry exported="true" kind="lib" path="lib/jmock-2.5.1/objenesis-1.0.jar"/> + <classpathentry kind="lib" path="C:/Bin/mysql-connector-java-5.0.7/mysql-connector-java-5.0.7-bin.jar" sourcepath="C:/Bin/mysql-connector-java-5.0.7/src"/> <classpathentry kind="output" path="build/eclipse"/> </classpath> Deleted: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-01 16:24:38 UTC (rev 20055) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-05 17:58:14 UTC (rev 20153) @@ -1,385 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.hibernate.eclipse.console.test.utils.tests; - -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.Writer; -import java.lang.ref.WeakReference; -import java.lang.reflect.Field; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.AccessController; -import java.sql.Driver; -import java.security.PrivilegedAction; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.Vector; - -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.apt.core.internal.JarClassLoader; -import org.hibernate.console.execution.DefaultExecutionContext; -import org.hibernate.console.execution.ExecutionContext; -import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin; -import org.hibernate.eclipse.console.test.utils.GarbageCollectionUtil; -import org.hibernate.util.ReflectHelper; - -import junit.framework.TestCase; - -/** - * The class intended to reproduce the reason of - * http://opensource.atlassian.com/projects/hibernate/browse/HBX-936 - * and road map how to fix it. - * - * @author Vitali Yemialyanchyk - */ -@SuppressWarnings("restriction") -public class DriverDeleteTest extends TestCase { - - public static final String DRIVER_TEST_NAME = "mysql-connector-java-5.0.7-bin.jar"; //$NON-NLS-1$ - public static final String DRIVER_GET_PATH = "testresources/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$ - public static final String DRIVER_PUT_PATH = "res/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$ - public static final String PUT_PATH = "res"; //$NON-NLS-1$ - - private WeakReference<ExecutionContext> executionContext = null; - - protected ClassLoader getParentClassLoader() { - return Thread.currentThread().getContextClassLoader(); - } - - protected URL[] getCustomClassPathURLs() { - URL[] customClassPathURLs = new URL[1]; - File driverJar2; - try { - driverJar2 = getResourceItem(DRIVER_PUT_PATH); - customClassPathURLs[0] = driverJar2.toURL(); - } catch (IOException e) { - e.printStackTrace(); - } - return customClassPathURLs; - } - - protected List<File> getCustomClassPathFiles() { - final List<File> files = new ArrayList<File>(); - File driverJar2; - try { - driverJar2 = getResourceItem(DRIVER_PUT_PATH); - files.add(driverJar2); - } catch (IOException e) { - e.printStackTrace(); - } - return files; - } - - protected File getResourceItem(String strResPath) throws IOException { - IPath resourcePath = new Path(strResPath); - File resourceFolder = resourcePath.toFile(); - URL entry = HibernateConsoleTestPlugin.getDefault().getBundle().getEntry( - strResPath); - URL resProject = FileLocator.resolve(entry); - String tplPrjLcStr = FileLocator.resolve(resProject).getFile(); - resourceFolder = new File(tplPrjLcStr); - return resourceFolder; - } - - public static void copyFile(File src, File dst) { - FileOutputStream fos = null; - FileInputStream fis = null; - try { - File ff = new File(dst.getPath(), src.getName()); - if (!ff.exists()) { - ff.createNewFile(); - } - fos = new FileOutputStream(ff); - fis = new FileInputStream(src); - byte b[] = new byte[ 1024 * 1024 ]; - int nOut = 0; - do { - nOut = fis.read(b); - fos.write(b, 0, nOut); - } while (nOut == b.length); - fos.flush(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (fos != null) { - try { - fos.close(); - } catch (IOException e) {} - } - if (fis != null) { - try { - fis.close(); - } catch (IOException e) {} - } - } - } - - protected void setUp() throws Exception { - File driverJar = getResourceItem(DRIVER_GET_PATH); - File driverJarFolder = getResourceItem(PUT_PATH); - copyFile(driverJar, driverJarFolder); - } - - public URLClassLoader createClassLoader() { - final URL[] customClassPathURLs = getCustomClassPathURLs(); - URLClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() { - public URLClassLoader run() { - return new URLClassLoader( customClassPathURLs, getParentClassLoader() ) { - public InputStream getResourceAsStream(String name) { - InputStream is = super.getResourceAsStream(name); - return is; - } - - public URL findResource(final String name) { - URL res = super.findResource(name); - return res; - } - - public Enumeration<URL> findResources(final String name) throws IOException { - Enumeration<URL> res = super.findResources(name); - return res; - } - - protected Class<?> findClass(String name) throws ClassNotFoundException { - Class<?> res = null; - try { - res = super.findClass(name); - } catch (ClassNotFoundException cnfe) { - throw cnfe; - } - return res; - } - - protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { - Class<?> res = null; - try { - res = super.loadClass(name, resolve); - } catch (ClassNotFoundException cnfe) { - throw cnfe; - } - return res; - } - - public Class<?> loadClass(String name) throws ClassNotFoundException { - Class<?> res = null; - try { - res = super.loadClass(name); - } catch (ClassNotFoundException cnfe) { - throw cnfe; - } - return res; - } - }; - } - }); - return urlClassLoader; - } - - public JarClassLoader createJarClassLoader() { - final List<File> files = getCustomClassPathFiles(); - JarClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<JarClassLoader>() { - public JarClassLoader run() { - return new JarClassLoader(files, getParentClassLoader()) { - }; - } - }); - return urlClassLoader; - } - - public class StringWriter extends Writer { - - public String res = new String(); - - @Override - public void close() throws IOException { - } - - @Override - public void flush() throws IOException { - } - - @Override - public void write(char[] cbuf, int off, int len) throws IOException { - res += cbuf.toString() + "\r\n"; //$NON-NLS-1$ - } - } - - @SuppressWarnings("unchecked") - public void forceDeleteDrivers() { - Class<DriverManager> clazz = DriverManager.class; - Vector drivers = null; - try { - Field field = clazz.getDeclaredField("drivers"); //$NON-NLS-1$ - field.setAccessible(true); - drivers = (Vector)field.get(null); - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (SecurityException e) { - e.printStackTrace(); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - if (drivers != null && drivers.size() > 0) { - drivers.clear(); - } - clazz = null; - drivers = null; - } - - @SuppressWarnings("unchecked") - public void initExecutionContext() { - /**/ - //URLClassLoader urlClassLoader = createClassLoader(); - JarClassLoader urlClassLoader = createJarClassLoader(); - /**/ - Class<Driver> driverClass = null; - try { - driverClass = (Class<Driver>)urlClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$ - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } - assertNotNull(driverClass); - /**/ - int numRedDrivers = 0; - StringWriter wr = new StringWriter(); - PrintWriter pw = new PrintWriter(wr); - DriverManager.setLogWriter(pw); - Driver driver = null; - /**/ - try { - driver = driverClass.newInstance(); - DriverManager.registerDriver(driver); - //DriverManager.deregisterDriver(driver); - java.util.Enumeration<Driver> drEnum = DriverManager.getDrivers(); - while (drEnum.hasMoreElements()) { - driver = drEnum.nextElement(); - DriverManager.deregisterDriver(driver); - numRedDrivers++; - } - } catch (SQLException e) { - e.printStackTrace(); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - /**/ - System.out.print(wr.res); - /** / - DefaultExecutionContext dec = new DefaultExecutionContext(getName(), urlClassLoader); - executionContext = new WeakReference<ExecutionContext>(dec); - /** / - ExecutionContext.Command command = new ExecutionContext.Command() { - public Object execute() { - try { - Class<Driver> driverClass = null; - //if (driverClass != null) { - //driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ - ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); - if (contextClassLoader != null) { - driverClass = (Class<Driver>)contextClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$ - } - //if (driverClass == null) { - //driverClass.newInstance(); - //DriverManager.registerDriver(driverClass.newInstance()); - //} - //} - //contextClassLoader = null; - //driverClass = null; - //} catch (InstantiationException e) { - // e.printStackTrace(); - //} catch (IllegalAccessException e) { - // e.printStackTrace(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - //} catch (SQLException e) { - // e.printStackTrace(); - } - return null; - } - }; - dec.execute(command); - command = null; - dec = null; - /** / - forceDeleteDrivers(); - // - // obligatory in other case gc can't collect these variables!!! - driver = null; - driverClass = null; - urlClassLoader = null; - forceCollectGarbage(); - /**/ - urlClassLoader.close(); - } - - public void cleanupExecutionContext() { - if (executionContext != null && executionContext.get() != null) { - executionContext.get().execute(new ExecutionContext.Command() { - - @SuppressWarnings("unchecked") - public Object execute() { - try { - Class<Driver> driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ - DriverManager.deregisterDriver(driverClass.newInstance()); - } catch (InstantiationException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - } catch (SQLException e) { - e.printStackTrace(); - } - return null; - } - }); - executionContext = null; - } - // - GarbageCollectionUtil.forceCollectGarbage(); - } - - public void testDelete() { - initExecutionContext(); - cleanupExecutionContext(); - boolean res = false; - File file = null; - try { - file = getResourceItem(DRIVER_PUT_PATH); - } catch (IOException e) { - e.printStackTrace(); - } - if (file != null && file.exists()) { - if (file.delete()) { - res = true; - } - } - assertEquals(true, res); - } - - protected void tearDown() throws Exception { - cleanupExecutionContext(); - } - -} Copied: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java (from rev 20152, trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java) =================================================================== --- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java (rev 0) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-05 17:58:14 UTC (rev 20153) @@ -0,0 +1,677 @@ +/******************************************************************************* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.hibernate.eclipse.console.test.utils.tests; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.io.Writer; +import java.lang.ref.WeakReference; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.net.URL; +import java.net.URLClassLoader; +import java.security.AccessController; +import java.sql.Driver; +import java.security.PrivilegedAction; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; +import java.util.Vector; +import java.util.jar.JarFile; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.apt.core.internal.JarClassLoader; +import org.hibernate.console.ConsoleConfigClassLoader; +import org.hibernate.console.execution.DefaultExecutionContext; +import org.hibernate.console.execution.ExecutionContext; +import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin; +import org.hibernate.eclipse.console.test.utils.GarbageCollectionUtil; +import org.hibernate.util.ReflectHelper; + +import com.mysql.jdbc.Messages; + +//import sun.reflect.FieldAccessor; + +import junit.framework.TestCase; + +/** + * The class intended to reproduce the reason of + * http://opensource.atlassian.com/projects/hibernate/browse/HBX-936 + * and road map how to fix it. + * + * @author Vitali Yemialyanchyk + */ +@SuppressWarnings("restriction") +public class DriverDeleteTest extends TestCase { + + public static final String DRIVER_TEST_NAME = "mysql-connector-java-5.0.7-bin.jar"; //$NON-NLS-1$ + public static final String DRIVER_GET_PATH = "testresources/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$ + public static final String DRIVER_PUT_PATH = "res/".replaceAll("//", File.separator) + DRIVER_TEST_NAME; //$NON-NLS-1$ //$NON-NLS-2$ + public static final String PUT_PATH = "res"; //$NON-NLS-1$ + + private WeakReference<ExecutionContext> executionContext = null; + private ClassLoader prevClassLoader = null; + + protected ClassLoader getParentClassLoader() { + return Thread.currentThread().getContextClassLoader(); + } + + protected URL[] getCustomClassPathURLs() { + URL[] customClassPathURLs = new URL[1]; + File driverJar2; + try { + driverJar2 = getResourceItem(DRIVER_PUT_PATH); + customClassPathURLs[0] = driverJar2.toURL(); + } catch (IOException e) { + e.printStackTrace(); + } + return customClassPathURLs; + } + + protected List<File> getCustomClassPathFiles() { + final List<File> files = new ArrayList<File>(); + File driverJar2; + try { + driverJar2 = getResourceItem(DRIVER_PUT_PATH); + files.add(driverJar2); + } catch (IOException e) { + e.printStackTrace(); + } + return files; + } + + protected File getResourceItem(String strResPath) throws IOException { + IPath resourcePath = new Path(strResPath); + File resourceFolder = resourcePath.toFile(); + URL entry = HibernateConsoleTestPlugin.getDefault().getBundle().getEntry( + strResPath); + URL resProject = FileLocator.resolve(entry); + String tplPrjLcStr = FileLocator.resolve(resProject).getFile(); + resourceFolder = new File(tplPrjLcStr); + return resourceFolder; + } + + public static void copyFile(File src, File dst) { + FileOutputStream fos = null; + FileInputStream fis = null; + try { + File ff = new File(dst.getPath(), src.getName()); + if (!ff.exists()) { + ff.createNewFile(); + } + fos = new FileOutputStream(ff); + fis = new FileInputStream(src); + byte b[] = new byte[ 1024 * 1024 ]; + int nOut = 0; + do { + nOut = fis.read(b); + fos.write(b, 0, nOut); + } while (nOut == b.length); + fos.flush(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (fos != null) { + try { + fos.close(); + } catch (IOException e) {} + } + if (fis != null) { + try { + fis.close(); + } catch (IOException e) {} + } + } + } + + protected void setUp() throws Exception { + File driverJar = getResourceItem(DRIVER_GET_PATH); + File driverJarFolder = getResourceItem(PUT_PATH); + copyFile(driverJar, driverJarFolder); + } + + public URLClassLoader createClassLoader() { + final URL[] customClassPathURLs = getCustomClassPathURLs(); + URLClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() { + public URLClassLoader run() { + return new URLClassLoader( customClassPathURLs, getParentClassLoader() ) { + public InputStream getResourceAsStream(String name) { + InputStream is = super.getResourceAsStream(name); + return is; + } + + public URL findResource(final String name) { + URL res = super.findResource(name); + return res; + } + + public Enumeration<URL> findResources(final String name) throws IOException { + Enumeration<URL> res = super.findResources(name); + return res; + } + + protected Class<?> findClass(String name) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.findClass(name); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + + protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.loadClass(name, resolve); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + + public Class<?> loadClass(String name) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.loadClass(name); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + }; + } + }); + return urlClassLoader; + } + + public JarClassLoader createJarClassLoader() { + final List<File> files = getCustomClassPathFiles(); + JarClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<JarClassLoader>() { + public JarClassLoader run() { + return new JarClassLoader(files, getParentClassLoader()) { + }; + } + }); + return urlClassLoader; + } + + public ConsoleConfigClassLoader createJarClassLoader2() { + final URL[] customClassPathURLs = getCustomClassPathURLs(); + ConsoleConfigClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<ConsoleConfigClassLoader>() { + public ConsoleConfigClassLoader run() { + return new ConsoleConfigClassLoader(customClassPathURLs, getParentClassLoader()) { + public InputStream getResourceAsStream(String name) { + InputStream is = super.getResourceAsStream(name); + return is; + } + + public URL findResource(final String name) { + URL res = super.findResource(name); + return res; + } + + public Enumeration<URL> findResources(final String name) throws IOException { + Enumeration<URL> res = super.findResources(name); + return res; + } + + protected Class<?> findClass(String name) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.findClass(name); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + + protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.loadClass(name, resolve); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + + public Class<?> loadClass(String name) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.loadClass(name); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + }; + } + }); + return urlClassLoader; + } + + public class StringWriter extends Writer { + + public String res = new String(); + + @Override + public void close() throws IOException { + } + + @Override + public void flush() throws IOException { + } + + @Override + public void write(char[] cbuf, int off, int len) throws IOException { + res += cbuf.toString() + "\r\n"; //$NON-NLS-1$ + } + } + + @SuppressWarnings("unchecked") + public void forceDeleteDrivers() { + Class<DriverManager> clazz = DriverManager.class; + Vector drivers = null; + try { + Field field = clazz.getDeclaredField("drivers"); //$NON-NLS-1$ + field.setAccessible(true); + drivers = (Vector)field.get(null); + } catch (IllegalArgumentException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + if (drivers != null && drivers.size() > 0) { + drivers.clear(); + } + clazz = null; + drivers = null; + } + + static Object testStaticObj; + + @SuppressWarnings({"unchecked", "unused", "nls"}) + public void initExecutionContext() { + /**/ + //URLClassLoader urlClassLoader = createClassLoader(); + //JarClassLoader urlClassLoader = createJarClassLoader(); + final ConsoleConfigClassLoader urlClassLoader = createJarClassLoader2(); + /** / + prevClassLoader = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(urlClassLoader); + ClassLoader prevClassLoader22 = Thread.currentThread().getContextClassLoader(); + // + Class<Driver> driverClass22 = null; + Class<Driver> driverClass = null; + try { + driverClass = (Class<Driver>)urlClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + assertNotNull(driverClass); + /**/ + int numRedDrivers = 0; + //StringWriter wr = new StringWriter(); + //PrintWriter pw = new PrintWriter(wr); + //DriverManager.setLogWriter(pw); + Driver driver = null; + /** / + Connection connection = null; + String test = ""; //$NON-NLS-1$ + try { + driver = driverClass.newInstance(); + //DriverManager.registerDriver(driver); + //driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + //driver = driverClass.newInstance(); + //DriverManager.registerDriver(driver); + //DriverManager.deregisterDriver(driver); + java.util.Enumeration<Driver> drEnum = DriverManager.getDrivers(); + while (drEnum.hasMoreElements()) { + driver = drEnum.nextElement(); +// DriverManager.deregisterDriver(driver); + numRedDrivers++; + } + java.util.Properties info = new java.util.Properties(); + info.put("user", "root"); + info.put("password", "p@ssw0rd2"); + connection = driver.connect("jdbc:mysql://localhost:3306/jpa", info); + //connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd"); + test = connection.getCatalog(); + connection.close(); + DriverManager.deregisterDriver(driver); + //} catch (ClassNotFoundException e) { + // e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + System.out.print(test); + System.out.print(numRedDrivers); + /** / + System.out.print(wr.res); + /**/ + DefaultExecutionContext dec = new DefaultExecutionContext(getName(), urlClassLoader); + executionContext = new WeakReference<ExecutionContext>(dec); + /**/ + ExecutionContext.Command command = new ExecutionContext.Command() { + public Object execute() { + try { + Class<Driver> driverClass = null; + //Class.forName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + //if (driverClass != null) { + driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + Driver driver2 = driverClass.newInstance(); + //DriverManager.registerDriver(driver2); + ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); + if (contextClassLoader != null) { + driverClass = (Class<Driver>)contextClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + } + //if (driverClass == null) { + //driverClass.newInstance(); + //DriverManager.registerDriver(driverClass.newInstance()); + //} + java.util.Properties info = new java.util.Properties(); + info.put("user", "root"); + info.put("password", "p@ssw0rd2"); + + /** / + try { + Connection connection = driver2.connect("jdbc:mysql://localhost:3306/jpa", info); + //Connection connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + //String test = connection.getCatalog(); + + //System.out.println(test); + //System.out.println(test); + connection.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + /**/ + + Object obj = null; + Field f = null; + + /**/ + Class<com.mysql.jdbc.Connection> connClass = ReflectHelper.classForName("com.mysql.jdbc.Connection"); //$NON-NLS-1$ + f = connClass.getDeclaredField("cancelTimer"); + f.setAccessible(true); + java.util.Timer timer = (java.util.Timer)f.get(null); + if (timer != null) { + timer.cancel(); + timer.purge(); + } + f.set(null, null); + + Class<com.mysql.jdbc.LoadBalancingConnectionProxy> classLoadBalancingConnectionProxyClass = ReflectHelper.classForName("com.mysql.jdbc.LoadBalancingConnectionProxy"); //$NON-NLS-1$ + f = classLoadBalancingConnectionProxyClass.getDeclaredField("getLocalTimeMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + + Class<com.mysql.jdbc.StandardSocketFactory> classStandardSocketFactory = ReflectHelper.classForName("com.mysql.jdbc.StandardSocketFactory"); //$NON-NLS-1$ + f = classStandardSocketFactory.getDeclaredField("setTraficClassMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + + Class<com.mysql.jdbc.StringUtils> classStringUtils = ReflectHelper.classForName("com.mysql.jdbc.StringUtils"); //$NON-NLS-1$ + f = classStringUtils.getDeclaredField("toPlainStringMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + /**/ + + Class<com.mysql.jdbc.Util> classUtil = ReflectHelper.classForName("com.mysql.jdbc.Util"); //$NON-NLS-1$ + f = classUtil.getDeclaredField("systemNanoTimeMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + /** / + // + f = classUtil.getDeclaredField("DEFAULT_TIMEZONE"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classUtil.getDeclaredField("enclosingInstance"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + /** / + testStaticObj = Locale.getDefault(); + /**/ + ResourceBundle temp = ResourceBundle.getBundle("com.mysql.jdbc.LocalizedErrorMessages", Locale.getDefault(), + urlClassLoader); + /**/ + final String resName = "com.mysql.jdbc.LocalizedErrorMessages".replace('.', '/') + ".properties"; + InputStream stream = (InputStream)java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public Object run() { + if (urlClassLoader != null) { + return urlClassLoader.getResourceAsStream(resName); + } else { + return ClassLoader.getSystemResourceAsStream(resName); + } + } + } + ); + + if (stream != null) { + // make sure it is buffered + stream = new java.io.BufferedInputStream(stream); + java.util.PropertyResourceBundle prb = new PropertyResourceBundle(stream); + stream.close(); + } + // + /**/ + // + Class<com.mysql.jdbc.Messages> classMessages = ReflectHelper.classForName("com.mysql.jdbc.Messages"); //$NON-NLS-1$ + f = classMessages.getDeclaredField("BUNDLE_NAME"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classMessages.getDeclaredField("RESOURCE_BUNDLE"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + /**/ + //Class<java.util.ResourceBundle> classResourceBundle = ReflectHelper.classForName("java.util.ResourceBundle"); //$NON-NLS-1$ + //Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)obj.getClass(); + Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)temp.getClass(); + Class<java.util.ResourceBundle> classResourceBundle = (Class<ResourceBundle>)classPropertyResourceBundle.getSuperclass(); //$NON-NLS-1$ + f = classResourceBundle.getDeclaredField("cacheKey"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("underConstruction"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("NOT_FOUND"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("cacheList"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("referenceQueue"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + /**/ + + /**/ + //Class<sun.net.www.protocol.jar.JarURLConnection> classJarURLConnection = ReflectHelper.classForName("sun.net.www.protocol.jar.JarURLConnection"); //$NON-NLS-1$ + //f = classJarURLConnection.getDeclaredField("factory"); + //f.setAccessible(true); + //obj = f.get(null); + //f.set(null, null); + // + Class classJarFileFactory = obj.getClass(); + f = classJarFileFactory.getDeclaredField("fileCache"); + f.setAccessible(true); + obj = f.get(null); + HashMap fileCache = (HashMap)obj; + f.set(null, null); + // + f = classJarFileFactory.getDeclaredField("urlCache"); + f.setAccessible(true); + obj = f.get(null); + HashMap urlCache = (HashMap)obj; + f.set(null, null); + // + Iterator it = urlCache.keySet().iterator(); + while (it.hasNext()) { + JarFile jarFile = (JarFile)it.next(); + if (jarFile.getName().equals(DRIVER_TEST_NAME)) { + jarFile.close(); + } + } + /**/ + //DriverManager.deregisterDriver(driver2); + //} + //contextClassLoader = null; + //driverClass = null; + } catch (IOException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + //} catch (SQLException e) { + // e.printStackTrace(); + } + return null; + } + }; + dec.execute(command); + command = null; + dec = null; + /** / + forceDeleteDrivers(); + // + // obligatory in other case gc can't collect these variables!!! + driver = null; + driverClass = null; + urlClassLoader = null; + forceCollectGarbage(); + /**/ + urlClassLoader.close(); + } + + private static final String MODIFIERS_FIELD = "modifiers"; + + public static void setStaticFinalField(Field field, Object value) + throws NoSuchFieldException, IllegalAccessException { + /** / + field.setAccessible(true); + Field modifiersField = Field.class.getDeclaredField(MODIFIERS_FIELD); + modifiersField.setAccessible(true); + int modifiers = modifiersField.getInt(field); + modifiers &= ~Modifier.FINAL; + modifiersField.setInt(field, modifiers); + sun.reflect.ReflectionFactory reflection = + sun.reflect.ReflectionFactory.getReflectionFactory(); + FieldAccessor fa = reflection.newFieldAccessor(field, false); + fa.set(null, value); + /**/ + } + + public void cleanupExecutionContext() { + /** / + if (executionContext != null && executionContext.get() != null) { + executionContext.get().execute(new ExecutionContext.Command() { + + @SuppressWarnings("unchecked") + public Object execute() { + try { + Class<Driver> driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + DriverManager.deregisterDriver(driverClass.newInstance()); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } catch (SQLException e) { + e.printStackTrace(); + } + return null; + } + }); + executionContext = null; + } + /**/ + // + if (prevClassLoader != null) { + Thread.currentThread().setContextClassLoader(prevClassLoader); + } + // + GarbageCollectionUtil.forceCollectGarbage(); + } + + public void testDelete() { + initExecutionContext(); + cleanupExecutionContext(); + boolean res = false; + File file = null; + try { + file = getResourceItem(DRIVER_PUT_PATH); + } catch (IOException e) { + e.printStackTrace(); + } + if (file != null && file.exists()) { + if (file.delete()) { + res = true; + } + } + assertEquals(true, res); + } + + protected void tearDown() throws Exception { + cleanupExecutionContext(); + } + +}

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20152 - trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-02-05 12:53:54 -0500 (Fri, 05 Feb 2010) New Revision: 20152 Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java Log: Driver delete tests - save into Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java =================================================================== --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-05 16:15:26 UTC (rev 20151) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/utils/tests/DriverDeleteTest.java 2010-02-05 17:53:54 UTC (rev 20152) @@ -19,28 +19,41 @@ import java.io.Writer; import java.lang.ref.WeakReference; import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.net.URL; import java.net.URLClassLoader; import java.security.AccessController; import java.sql.Driver; import java.security.PrivilegedAction; +import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; import java.util.List; +import java.util.Locale; +import java.util.PropertyResourceBundle; +import java.util.ResourceBundle; import java.util.Vector; +import java.util.jar.JarFile; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.apt.core.internal.JarClassLoader; +import org.hibernate.console.ConsoleConfigClassLoader; import org.hibernate.console.execution.DefaultExecutionContext; import org.hibernate.console.execution.ExecutionContext; import org.hibernate.eclipse.console.test.HibernateConsoleTestPlugin; import org.hibernate.eclipse.console.test.utils.GarbageCollectionUtil; import org.hibernate.util.ReflectHelper; +import com.mysql.jdbc.Messages; + +//import sun.reflect.FieldAccessor; + import junit.framework.TestCase; /** @@ -59,6 +72,7 @@ public static final String PUT_PATH = "res"; //$NON-NLS-1$ private WeakReference<ExecutionContext> executionContext = null; + private ClassLoader prevClassLoader = null; protected ClassLoader getParentClassLoader() { return Thread.currentThread().getContextClassLoader(); @@ -204,6 +218,61 @@ return urlClassLoader; } + public ConsoleConfigClassLoader createJarClassLoader2() { + final URL[] customClassPathURLs = getCustomClassPathURLs(); + ConsoleConfigClassLoader urlClassLoader = AccessController.doPrivileged(new PrivilegedAction<ConsoleConfigClassLoader>() { + public ConsoleConfigClassLoader run() { + return new ConsoleConfigClassLoader(customClassPathURLs, getParentClassLoader()) { + public InputStream getResourceAsStream(String name) { + InputStream is = super.getResourceAsStream(name); + return is; + } + + public URL findResource(final String name) { + URL res = super.findResource(name); + return res; + } + + public Enumeration<URL> findResources(final String name) throws IOException { + Enumeration<URL> res = super.findResources(name); + return res; + } + + protected Class<?> findClass(String name) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.findClass(name); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + + protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.loadClass(name, resolve); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + + public Class<?> loadClass(String name) throws ClassNotFoundException { + Class<?> res = null; + try { + res = super.loadClass(name); + } catch (ClassNotFoundException cnfe) { + throw cnfe; + } + return res; + } + }; + } + }); + return urlClassLoader; + } + public class StringWriter extends Writer { public String res = new String(); @@ -246,12 +315,20 @@ drivers = null; } - @SuppressWarnings("unchecked") + static Object testStaticObj; + + @SuppressWarnings({"unchecked", "unused", "nls"}) public void initExecutionContext() { /**/ //URLClassLoader urlClassLoader = createClassLoader(); - JarClassLoader urlClassLoader = createJarClassLoader(); - /**/ + //JarClassLoader urlClassLoader = createJarClassLoader(); + final ConsoleConfigClassLoader urlClassLoader = createJarClassLoader2(); + /** / + prevClassLoader = Thread.currentThread().getContextClassLoader(); + Thread.currentThread().setContextClassLoader(urlClassLoader); + ClassLoader prevClassLoader22 = Thread.currentThread().getContextClassLoader(); + // + Class<Driver> driverClass22 = null; Class<Driver> driverClass = null; try { driverClass = (Class<Driver>)urlClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$ @@ -261,21 +338,36 @@ assertNotNull(driverClass); /**/ int numRedDrivers = 0; - StringWriter wr = new StringWriter(); - PrintWriter pw = new PrintWriter(wr); - DriverManager.setLogWriter(pw); + //StringWriter wr = new StringWriter(); + //PrintWriter pw = new PrintWriter(wr); + //DriverManager.setLogWriter(pw); Driver driver = null; - /**/ + /** / + Connection connection = null; + String test = ""; //$NON-NLS-1$ try { driver = driverClass.newInstance(); - DriverManager.registerDriver(driver); + //DriverManager.registerDriver(driver); + //driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + //driver = driverClass.newInstance(); + //DriverManager.registerDriver(driver); //DriverManager.deregisterDriver(driver); java.util.Enumeration<Driver> drEnum = DriverManager.getDrivers(); while (drEnum.hasMoreElements()) { driver = drEnum.nextElement(); - DriverManager.deregisterDriver(driver); +// DriverManager.deregisterDriver(driver); numRedDrivers++; } + java.util.Properties info = new java.util.Properties(); + info.put("user", "root"); + info.put("password", "p@ssw0rd2"); + connection = driver.connect("jdbc:mysql://localhost:3306/jpa", info); + //connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd"); + test = connection.getCatalog(); + connection.close(); + DriverManager.deregisterDriver(driver); + //} catch (ClassNotFoundException e) { + // e.printStackTrace(); } catch (SQLException e) { e.printStackTrace(); } catch (InstantiationException e) { @@ -283,18 +375,23 @@ } catch (IllegalAccessException e) { e.printStackTrace(); } + System.out.print(test); + System.out.print(numRedDrivers); + /** / + System.out.print(wr.res); /**/ - System.out.print(wr.res); - /** / DefaultExecutionContext dec = new DefaultExecutionContext(getName(), urlClassLoader); executionContext = new WeakReference<ExecutionContext>(dec); - /** / + /**/ ExecutionContext.Command command = new ExecutionContext.Command() { public Object execute() { try { Class<Driver> driverClass = null; + //Class.forName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ //if (driverClass != null) { - //driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + driverClass = ReflectHelper.classForName("com.mysql.jdbc.Driver"); //$NON-NLS-1$ + Driver driver2 = driverClass.newInstance(); + //DriverManager.registerDriver(driver2); ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader(); if (contextClassLoader != null) { driverClass = (Class<Driver>)contextClassLoader.loadClass("com.mysql.jdbc.Driver"); //$NON-NLS-1$ @@ -303,13 +400,184 @@ //driverClass.newInstance(); //DriverManager.registerDriver(driverClass.newInstance()); //} + java.util.Properties info = new java.util.Properties(); + info.put("user", "root"); + info.put("password", "p@ssw0rd2"); + + /** / + try { + Connection connection = driver2.connect("jdbc:mysql://localhost:3306/jpa", info); + //Connection connection = DriverManager.getConnection("jdbc:mysql://localhost:3306/jpa", "root", "p@ssw0rd"); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ + //String test = connection.getCatalog(); + + //System.out.println(test); + //System.out.println(test); + connection.close(); + } catch (SQLException e) { + e.printStackTrace(); + } + /**/ + + Object obj = null; + Field f = null; + + /**/ + Class<com.mysql.jdbc.Connection> connClass = ReflectHelper.classForName("com.mysql.jdbc.Connection"); //$NON-NLS-1$ + f = connClass.getDeclaredField("cancelTimer"); + f.setAccessible(true); + java.util.Timer timer = (java.util.Timer)f.get(null); + if (timer != null) { + timer.cancel(); + timer.purge(); + } + f.set(null, null); + + Class<com.mysql.jdbc.LoadBalancingConnectionProxy> classLoadBalancingConnectionProxyClass = ReflectHelper.classForName("com.mysql.jdbc.LoadBalancingConnectionProxy"); //$NON-NLS-1$ + f = classLoadBalancingConnectionProxyClass.getDeclaredField("getLocalTimeMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + + Class<com.mysql.jdbc.StandardSocketFactory> classStandardSocketFactory = ReflectHelper.classForName("com.mysql.jdbc.StandardSocketFactory"); //$NON-NLS-1$ + f = classStandardSocketFactory.getDeclaredField("setTraficClassMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + + Class<com.mysql.jdbc.StringUtils> classStringUtils = ReflectHelper.classForName("com.mysql.jdbc.StringUtils"); //$NON-NLS-1$ + f = classStringUtils.getDeclaredField("toPlainStringMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + /**/ + + Class<com.mysql.jdbc.Util> classUtil = ReflectHelper.classForName("com.mysql.jdbc.Util"); //$NON-NLS-1$ + f = classUtil.getDeclaredField("systemNanoTimeMethod"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + /** / + // + f = classUtil.getDeclaredField("DEFAULT_TIMEZONE"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classUtil.getDeclaredField("enclosingInstance"); + f.setAccessible(true); + obj = f.get(null); + f.set(null, null); + /** / + testStaticObj = Locale.getDefault(); + /**/ + ResourceBundle temp = ResourceBundle.getBundle("com.mysql.jdbc.LocalizedErrorMessages", Locale.getDefault(), + urlClassLoader); + /**/ + final String resName = "com.mysql.jdbc.LocalizedErrorMessages".replace('.', '/') + ".properties"; + InputStream stream = (InputStream)java.security.AccessController.doPrivileged( + new java.security.PrivilegedAction() { + public Object run() { + if (urlClassLoader != null) { + return urlClassLoader.getResourceAsStream(resName); + } else { + return ClassLoader.getSystemResourceAsStream(resName); + } + } + } + ); + + if (stream != null) { + // make sure it is buffered + stream = new java.io.BufferedInputStream(stream); + java.util.PropertyResourceBundle prb = new PropertyResourceBundle(stream); + stream.close(); + } + // + /**/ + // + Class<com.mysql.jdbc.Messages> classMessages = ReflectHelper.classForName("com.mysql.jdbc.Messages"); //$NON-NLS-1$ + f = classMessages.getDeclaredField("BUNDLE_NAME"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classMessages.getDeclaredField("RESOURCE_BUNDLE"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + /**/ + //Class<java.util.ResourceBundle> classResourceBundle = ReflectHelper.classForName("java.util.ResourceBundle"); //$NON-NLS-1$ + //Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)obj.getClass(); + Class<java.util.PropertyResourceBundle> classPropertyResourceBundle = (Class<java.util.PropertyResourceBundle>)temp.getClass(); + Class<java.util.ResourceBundle> classResourceBundle = (Class<ResourceBundle>)classPropertyResourceBundle.getSuperclass(); //$NON-NLS-1$ + f = classResourceBundle.getDeclaredField("cacheKey"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("underConstruction"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("NOT_FOUND"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("cacheList"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + // + f = classResourceBundle.getDeclaredField("referenceQueue"); + f.setAccessible(true); + obj = f.get(null); + setStaticFinalField(f, null); + /**/ + + /**/ + //Class<sun.net.www.protocol.jar.JarURLConnection> classJarURLConnection = ReflectHelper.classForName("sun.net.www.protocol.jar.JarURLConnection"); //$NON-NLS-1$ + //f = classJarURLConnection.getDeclaredField("factory"); + //f.setAccessible(true); + //obj = f.get(null); + //f.set(null, null); + // + Class classJarFileFactory = obj.getClass(); + f = classJarFileFactory.getDeclaredField("fileCache"); + f.setAccessible(true); + obj = f.get(null); + HashMap fileCache = (HashMap)obj; + f.set(null, null); + // + f = classJarFileFactory.getDeclaredField("urlCache"); + f.setAccessible(true); + obj = f.get(null); + HashMap urlCache = (HashMap)obj; + f.set(null, null); + // + Iterator it = urlCache.keySet().iterator(); + while (it.hasNext()) { + JarFile jarFile = (JarFile)it.next(); + if (jarFile.getName().equals(DRIVER_TEST_NAME)) { + jarFile.close(); + } + } + /**/ + //DriverManager.deregisterDriver(driver2); //} //contextClassLoader = null; //driverClass = null; - //} catch (InstantiationException e) { - // e.printStackTrace(); - //} catch (IllegalAccessException e) { - // e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } catch (InstantiationException e) { + e.printStackTrace(); + } catch (IllegalAccessException e) { + e.printStackTrace(); } catch (ClassNotFoundException e) { e.printStackTrace(); //} catch (SQLException e) { @@ -333,7 +601,26 @@ urlClassLoader.close(); } + private static final String MODIFIERS_FIELD = "modifiers"; + + public static void setStaticFinalField(Field field, Object value) + throws NoSuchFieldException, IllegalAccessException { + /** / + field.setAccessible(true); + Field modifiersField = Field.class.getDeclaredField(MODIFIERS_FIELD); + modifiersField.setAccessible(true); + int modifiers = modifiersField.getInt(field); + modifiers &= ~Modifier.FINAL; + modifiersField.setInt(field, modifiers); + sun.reflect.ReflectionFactory reflection = + sun.reflect.ReflectionFactory.getReflectionFactory(); + FieldAccessor fa = reflection.newFieldAccessor(field, false); + fa.set(null, value); + /**/ + } + public void cleanupExecutionContext() { + /** / if (executionContext != null && executionContext.get() != null) { executionContext.get().execute(new ExecutionContext.Command() { @@ -356,7 +643,12 @@ }); executionContext = null; } + /**/ // + if (prevClassLoader != null) { + Thread.currentThread().setContextClassLoader(prevClassLoader); + } + // GarbageCollectionUtil.forceCollectGarbage(); }

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20151 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-02-05 11:15:26 -0500 (Fri, 05 Feb 2010) New Revision: 20151 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java Log: https://jira.jboss.org/jira/browse/JBIDE-3125 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-02-05 16:04:01 UTC (rev 20150) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2010-02-05 16:15:26 UTC (rev 20151) @@ -86,7 +86,7 @@ } /** - * Sorts CDI beans. Sets for alternative beans higher position and for nonalternative beans lower position. + * Sorts CDI beans which may be injected. Sets for alternative beans higher position and for nonalternative beans lower position. * * @param beans * @param element @@ -96,6 +96,9 @@ Set<IBean> nonAlternativeBeans = new HashSet<IBean>(); for(IBean bean : beans){ + if(bean == null || bean instanceof IDecorator || bean instanceof IInterceptor) + continue; + if(bean.isAlternative()) alternativeBeans.add(bean); else Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java 2010-02-05 16:04:01 UTC (rev 20150) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java 2010-02-05 16:15:26 UTC (rev 20151) @@ -84,8 +84,7 @@ int index=0; for(IBean bean : resultBeanList){ - if(bean != null) - hyperlinks[index++] = new InjectedPointHyperlink(region, bean, getDocument()); + hyperlinks[index++] = new InjectedPointHyperlink(region, bean, getDocument()); } if(hyperlinks.length == 0){

16 years, 2 months

1
0
0 / 0

JBoss Tools SVN: r20150 - branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-02-05 11:04:01 -0500 (Fri, 05 Feb 2010) New Revision: 20150 Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java Log: https://jira.jboss.org/jira/browse/JBIDE-5706 - update OpenMappingUtilsEjb3 Modified: branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java =================================================================== --- branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java 2010-02-05 16:03:14 UTC (rev 20149) +++ branches/hibernatetools-switch-to-hibernate-core-3.3/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtilsEjb3.java 2010-02-05 16:04:01 UTC (rev 20150) @@ -20,8 +20,14 @@ import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.ejb.Ejb3Configuration; import org.hibernate.ejb.HibernatePersistence; +import org.hibernate.ejb.packaging.ClassFilter; +import org.hibernate.ejb.packaging.Entry; +import org.hibernate.ejb.packaging.FileFilter; +import org.hibernate.ejb.packaging.Filter; import org.hibernate.ejb.packaging.JarVisitor; +import org.hibernate.ejb.packaging.JarVisitorFactory; import org.hibernate.ejb.packaging.NamedInputStream; +import org.hibernate.ejb.packaging.PackageFilter; import org.hibernate.ejb.packaging.PersistenceMetadata; import org.hibernate.ejb.packaging.PersistenceXmlLoader; import org.hibernate.util.CollectionHelper; @@ -88,18 +94,17 @@ URL visitorJarURL = null; if (metadata.getName() == null) { visitor = getMainJarVisitor(url, metadata, CollectionHelper.EMPTY_MAP); - visitorJarURL = JarVisitor.getJarURLFromURLEntry(url, "/" + META_INF_PERS_XML); //$NON-NLS-1$ + visitorJarURL = JarVisitorFactory.getJarURLFromURLEntry(url, "/" + META_INF_PERS_XML); //$NON-NLS-1$ metadata.setName(visitor.getUnqualifiedJarName()); } if (persistenceUnitName == null && xmls.hasMoreElements()) { - //throw new PersistenceException( "No name provided and several persistence units found" ); + //throw new PersistenceException("No name provided and several persistence units found"); stopErrorFlag = true; break; - } - else if (persistenceUnitName == null || metadata.getName().equals(persistenceUnitName)) { + } else if (persistenceUnitName == null || metadata.getName().equals(persistenceUnitName)) { if (visitor == null) { visitor = getMainJarVisitor(url, metadata, CollectionHelper.EMPTY_MAP); - visitorJarURL = JarVisitor.getJarURLFromURLEntry(url, "/" + META_INF_PERS_XML); //$NON-NLS-1$ + visitorJarURL = JarVisitorFactory.getJarURLFromURLEntry(url, "/" + META_INF_PERS_XML); //$NON-NLS-1$ } try { addMetadataFromVisitor(visitor, visitorJarURL.getPath(), metadata); @@ -145,10 +150,11 @@ * @param integration * @return */ - public static JarVisitor getMainJarVisitor(URL url, PersistenceMetadata metadata, Map integration) { - URL jarURL = JarVisitor.getJarURLFromURLEntry(url, "/" + META_INF_PERS_XML); //$NON-NLS-1$ - JarVisitor.Filter[] persistenceXmlFilter = getFilters(metadata, integration, metadata.getExcludeUnlistedClasses()); - JarVisitor visitor = JarVisitor.getVisitor(jarURL, persistenceXmlFilter); + @SuppressWarnings("unchecked") + private static JarVisitor getMainJarVisitor(URL url, PersistenceMetadata metadata, Map integration) { + URL jarURL = JarVisitorFactory.getJarURLFromURLEntry(url, "/" + META_INF_PERS_XML); //$NON-NLS-1$ + Filter[] persistenceXmlFilter = getFilters(metadata, integration, metadata.getExcludeUnlistedClasses()); + JarVisitor visitor = JarVisitorFactory.getVisitor(jarURL, persistenceXmlFilter); return visitor; } @@ -160,28 +166,28 @@ * @param metadata * @throws IOException */ - public static void addMetadataFromVisitor(JarVisitor visitor, String addPath, PersistenceMetadata metadata) throws IOException { + @SuppressWarnings("unchecked") + private static void addMetadataFromVisitor(JarVisitor visitor, String addPath, PersistenceMetadata metadata) throws IOException { Set[] entries = visitor.getMatchingEntries(); - JarVisitor.Filter[] filters = visitor.getFilters(); + Filter[] filters = visitor.getFilters(); int size = filters.length; List<String> classes = metadata.getClasses(); List<String> packages = metadata.getPackages(); List<NamedInputStream> hbmFiles = metadata.getHbmfiles(); + List<String> mappingFiles = metadata.getMappingFiles(); for (int index = 0; index < size; index++) { - Iterator homogeneousEntry = entries[index].iterator(); - while (homogeneousEntry.hasNext()) { - JarVisitor.Entry entry = (JarVisitor.Entry) homogeneousEntry.next(); - if (filters[index] instanceof JarVisitor.ClassFilter) { - //TODO only add entry if there is annotations (Javassist) + for (Object o : entries[index]) { + Entry entry = (Entry) o; + if (filters[index] instanceof ClassFilter) { classes.add(entry.getName()); - } - else if (filters[index] instanceof JarVisitor.PackageFilter) { + } else if (filters[index] instanceof PackageFilter) { packages.add(entry.getName()); - } - else if (filters[index] instanceof JarVisitor.FileFilter) { - hbmFiles.add(new NamedInputStream(addPath + "/" + entry.getName(), //$NON-NLS-1$ + } else if (filters[index] instanceof FileFilter) { + hbmFiles.add(new NamedInputStream(addPath + "/" + entry.getName(), //$NON-NLS-1$ entry.getInputStream())); - metadata.getMappingFiles().remove(entry.getName()); + if (mappingFiles != null) { + mappingFiles.remove(entry.getName()); + } } } } @@ -196,7 +202,8 @@ * @param excludeIfNotOverriden * @return */ - public static boolean[] getDetectedArtifacts(Properties properties, Map overridenProperties, boolean excludeIfNotOverriden) { + @SuppressWarnings("unchecked") + private static boolean[] getDetectedArtifacts(Properties properties, Map overridenProperties, boolean excludeIfNotOverriden) { //result[0] - detect classes //result[1] - detect hbm boolean[] result = { false, false }; @@ -205,7 +212,7 @@ detect = detect == null ? properties.getProperty( HibernatePersistence.AUTODETECTION) : detect; if (detect == null && excludeIfNotOverriden) { - //not overriden through HibernatePersistence.AUTODETECTION so we comply with the spec excludeUnlistedClasses + //not overridden through HibernatePersistence.AUTODETECTION so we comply with the spec excludeUnlistedClasses return result; } else if (detect == null){ @@ -233,21 +240,26 @@ * @param excludeIfNotOverriden * @return */ - public static JarVisitor.Filter[] getFilters(PersistenceMetadata metadata, Map overridenProperties, boolean excludeIfNotOverriden) { + @SuppressWarnings("unchecked") + private static Filter[] getFilters(PersistenceMetadata metadata, Map overridenProperties, boolean excludeIfNotOverriden) { Properties properties = metadata.getProps(); final List<String> mappingFiles = metadata.getMappingFiles(); - boolean[] result = getDetectedArtifacts(properties, overridenProperties, excludeIfNotOverriden); + boolean[] detectedArtifacts = getDetectedArtifacts(properties, overridenProperties, excludeIfNotOverriden); + return getFilters(detectedArtifacts, true, mappingFiles); + } - int size = ( result[0] ? 2 : 0 ) + 1; //class involves classes and packages, xml files are always involved because of orm.xml - JarVisitor.Filter[] filters = new JarVisitor.Filter[size]; - if (result[0]) { - filters[0] = new JarVisitor.PackageFilter(false, null) { + private static Filter[] getFilters(final boolean[] detectedArtifacts, final boolean searchORM, final List<String> mappingFiles) { + final int mappingFilesSize = mappingFiles != null ? mappingFiles.size() : 0; + int size = (detectedArtifacts[0] ? 2 : 0) + ((searchORM || detectedArtifacts[1] || mappingFilesSize > 0) ? 1 : 0); + Filter[] filters = new Filter[size]; + if (detectedArtifacts[0]) { + filters[0] = new PackageFilter(false, null) { public boolean accept(String javaElementName) { return true; } }; - filters[1] = new JarVisitor.ClassFilter( - false, new Class[]{ + filters[1] = new ClassFilter( + false, new Class[] { Entity.class, MappedSuperclass.class, Embeddable.class} @@ -257,23 +269,15 @@ } }; } - if (result[1]) { - filters[size - 1] = new JarVisitor.FileFilter(true) { + if (detectedArtifacts[1] || searchORM || mappingFilesSize > 0) { + filters[size - 1] = new FileFilter(true) { public boolean accept(String javaElementName) { - return javaElementName.endsWith("hbm.xml") //$NON-NLS-1$ - || javaElementName.endsWith(META_INF_ORM_XML) - || mappingFiles.contains(javaElementName); + return (detectedArtifacts[1] && javaElementName.endsWith("hbm.xml")) //$NON-NLS-1$ + || (searchORM && javaElementName.endsWith(META_INF_ORM_XML)) + || (mappingFilesSize > 0 && mappingFiles.contains(javaElementName)); } }; } - else { - filters[size - 1] = new JarVisitor.FileFilter(true) { - public boolean accept(String javaElementName) { - return javaElementName.endsWith(META_INF_ORM_XML) - || mappingFiles.contains(javaElementName); - } - }; - } return filters; }

16 years, 2 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits February 2010