JBoss Tools SVN: r40618 - trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-04-29 16:05:54 -0400 (Sun, 29 Apr 2012)
New Revision: 40618
Modified:
trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
Log:
JBIDE-11684 - EAP 5.0. ER6 Maven artefacts are not compatible with JBT Java EE Web Project
Modified: trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-04-29 01:20:25 UTC (rev 40617)
+++ trunk/maven/plugins/org.jboss.tools.maven.project.examples/src/org/jboss/tools/maven/project/examples/utils/MavenArtifactHelper.java 2012-04-29 20:05:54 UTC (rev 40618)
@@ -11,14 +11,18 @@
package org.jboss.tools.maven.project.examples.utils;
import java.util.ArrayList;
+import java.util.List;
import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.codehaus.plexus.DefaultPlexusContainer;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.m2e.core.MavenPlugin;
import org.eclipse.m2e.core.embedder.IMaven;
@@ -27,18 +31,27 @@
import org.jboss.tools.maven.project.examples.Messages;
import org.jboss.tools.maven.project.examples.xpl.DependencyKey;
import org.jboss.tools.project.examples.model.ProjectExample;
+import org.sonatype.aether.RepositorySystem;
+import org.sonatype.aether.repository.LocalRepository;
+import org.sonatype.aether.repository.RemoteRepository;
+import org.sonatype.aether.resolution.VersionRangeRequest;
+import org.sonatype.aether.resolution.VersionRangeResolutionException;
+import org.sonatype.aether.resolution.VersionRangeResult;
+import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.sonatype.aether.version.Version;
public class MavenArtifactHelper {
private static final DependencyKey ENTERPRISE_JBOSS_SPEC = DependencyKey.fromPortableString("org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1::"); //$NON-NLS-1$
+ private static final String COORDS = "org.jboss.spec:jboss-javaee-web-6.0:[0,)"; //$NON-NLS-1$
/**
* Checks if the EAP repository is available
*
- * @return true if org.jboss.spec:jboss-javaee-web-6.0:pom:3.0.0.Beta1-redhat-1 can be resolved
+ * @return true if org.jboss.spec:jboss-javaee-web-6.0:pom:*redhat* can be resolved
*/
public static boolean isEnterpriseRepositoryAvailable() {
- boolean isRepoAvailable = isArtifactAvailable(ENTERPRISE_JBOSS_SPEC); //$NON-NLS-1$
+ boolean isRepoAvailable = artifactExists(COORDS);
return isRepoAvailable;
}
@@ -91,4 +104,48 @@
}
return Status.OK_STATUS;
}
+
+ private static boolean artifactExists(String coords) {
+ RepositorySystem system;
+ try {
+ system = new DefaultPlexusContainer()
+ .lookup(RepositorySystem.class);
+ } catch (Exception e) {
+ MavenProjectExamplesActivator.log(e);
+ return false;
+ }
+ MavenRepositorySystemSession session = new MavenRepositorySystemSession();
+ String localRepoHome = System.getProperty("user.home") //$NON-NLS-1$
+ + Path.SEPARATOR + ".m2" + Path.SEPARATOR + "repository"; //$NON-NLS-1$ //$NON-NLS-2$
+ LocalRepository localRepo = new LocalRepository(localRepoHome);
+ session.setLocalRepositoryManager(system.newLocalRepositoryManager(localRepo));
+ org.sonatype.aether.artifact.Artifact artifact = new DefaultArtifact(coords);
+ VersionRangeRequest rangeRequest = new VersionRangeRequest();
+ rangeRequest.setArtifact(artifact);
+ List<ArtifactRepository> repos = new ArrayList<ArtifactRepository>();
+ IMaven maven = MavenPlugin.getMaven();
+ try {
+ repos.addAll(maven.getArtifactRepositories(false));
+ } catch (CoreException e) {
+ MavenProjectExamplesActivator.log(e);
+ return false;
+ }
+ for (ArtifactRepository repo : repos) {
+ RemoteRepository remoteRepo = new RemoteRepository(repo.getId(), "default", repo.getUrl()); //$NON-NLS-1$
+ rangeRequest.addRepository(remoteRepo);
+ }
+ try {
+ VersionRangeResult result = system.resolveVersionRange(
+ session, rangeRequest);
+ List<Version> versions = result.getVersions();
+ for (Version version:versions) {
+ if (version != null && version.toString().contains("redhat")) { //$NON-NLS-1$
+ return true;
+ }
+ }
+ } catch (VersionRangeResolutionException e) {
+ MavenProjectExamplesActivator.log(e);
+ }
+ return false;
+ }
}
13 years, 5 months
JBoss Tools SVN: r40617 - trunk/download.jboss.org/jbosstools/builds/cascade.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-28 21:20:25 -0400 (Sat, 28 Apr 2012)
New Revision: 40617
Modified:
trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
Log:
birt now depends on hibernatetools; update swimlanes.txt and job linkages in trunk and stable_branch
Modified: trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt
===================================================================
--- trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-04-29 01:06:34 UTC (rev 40616)
+++ trunk/download.jboss.org/jbosstools/builds/cascade/swimlanes.txt 2012-04-29 01:20:25 UTC (rev 40617)
@@ -1,4 +1,4 @@
-Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/03/22
+Revised swimlanes, as implemented in 3.2_stable_branch, 3.3_stable_branch and 3.3_trunk jobs, 2012/04/28
See also https://svn.jboss.org/repos/jbosstools/trunk/build/ -> pom*.xml
@@ -47,6 +47,7 @@
ws -> common
maven -> examples
openshift -> as, jmx, archives, common, tests
+birt -> hibernatetools
------------------------
13 years, 5 months
JBoss Tools SVN: r40614 - branches/jbosstools-3.3.0.Beta3/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-28 20:31:44 -0400 (Sat, 28 Apr 2012)
New Revision: 40614
Modified:
branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml
Log:
switch to stable_branch
Modified: branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml 2012-04-28 19:08:03 UTC (rev 40613)
+++ branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml 2012-04-29 00:31:44 UTC (rev 40614)
@@ -35,7 +35,7 @@
<!-- 1a. URL of latest JBT target platform site -->
<jbosstools-target-site>http://download.jboss.org/jbosstools/updates/target-platform_3.3.indigo.S...</jbosstools-target-site>
- <!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/trunk/build/target-platform/REPO/ -->
+ <!-- 1b. or use -Plocal.site -Dlocal.site=file:///${HOME}/3.3.indigo/build/target-platform/REPO/ -->
<!-- TODO: don't forget to update JBDS .updatesite jobs when this value changes! -->
<!-- TODO: see also 'hudson' profile below for other default value -->
<local.site>file:///${user.home}/.m2/jbosstools-target-platform_3.3.indigo.SR2/</local.site>
@@ -43,9 +43,9 @@
<!-- 2a. URL of latest JBT nightly staging composite site (all the components
in once place) -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/trunk/</jbosstools-nightly-staging-composite>
+ <jbosstools-nightly-staging-composite>http://download.jboss.org/jbosstools/builds/staging/_composite_/core/3.3....</jbosstools-nightly-staging-composite>
<!-- this site is not enabled by default as SOA Tooling is a downstream project (sorta). -->
- <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooli...</jbosstools-nightly-staging-composite-soa-tooling>
+ <jbosstools-nightly-staging-composite-soa-tooling>http://download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooli...</jbosstools-nightly-staging-composite-soa-tooling>
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
@@ -60,11 +60,11 @@
<!-- 4. published aggregate update sites go here, for consumption by QE
and downstream JBDS builds -->
- <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/trunk/</jbosstools-nightly>
- <jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/trunk/</jbosstools-nightly-tests>
+ <jbosstools-nightly>http://download.jboss.org/jbosstools/updates/nightly/core/3.3.indigo/</jbosstools-nightly>
+ <jbosstools-nightly-tests>http://download.jboss.org/jbosstools/updates/nightly/coretests/3.3.indigo/</jbosstools-nightly-tests>
<!-- these sites are not enabled by default as SOA Tooling is a downstream project (sorta). -->
- <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/trunk/</jbosstools-nightly-soa-tooling>
- <jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbosstools/updates/nightly/soatests/trunk/</jbosstools-nightly-soa-tooling-tests>
+ <jbosstools-nightly-soa-tooling>http://download.jboss.org/jbosstools/updates/nightly/soa-tooling/3.3.indigo/</jbosstools-nightly-soa-tooling>
+ <jbosstools-nightly-soa-tooling-tests>http://download.jboss.org/jbosstools/updates/nightly/soatests/3.3.indigo/</jbosstools-nightly-soa-tooling-tests>
<!-- 5. extra requirements (for 3rd party "Extras" site) -->
<jboss-requirements-composite-extras-mirror>http://download.jboss.org/jbosstools/updates/indigo/extras/SR1a/</jboss-requirements-composite-extras-mirror>
@@ -599,7 +599,7 @@
<!-- To use this profile, must have first created a local.target file,
which points to a local repo. You can do this by hand or generate it from
- multiple.target using: cd ~/trunk/build/target-platform; ant See also the
+ multiple.target using: cd ~/3.3.indigo/build/target-platform; ant See also the
README in target-platform/ folder for additional usage examples. You can
also run `ant help`. If you want to build the target-platform/pom.xml AND
generate a local repo + local.target file ALL AT THE SAME TIME, you can do:
13 years, 5 months
JBoss Tools SVN: r40613 - in branches/jbosstools-3.3.0.Beta3/build: target-platform and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-28 15:08:03 -0400 (Sat, 28 Apr 2012)
New Revision: 40613
Modified:
branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml
branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target
branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml
Log:
switch to stable_branch (Beta3)
Modified: branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
+++ branches/jbosstools-3.3.0.Beta3/build/parent/pom.xml 2012-04-28 19:08:03 UTC (rev 40613)
@@ -49,7 +49,7 @@
<!-- 2b. or use -Plocal.composite -Dlocal.composite=file:///path/to/mirror/of/composite/staging/site/ -->
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/trunk/</local.composite>
+ <local.composite>file:///home/hudson/static_build_env/jbds/builds/staging/_composite_/3.3.indigo/</local.composite>
<!-- 3a. URL of latest JBT requirements composite mirror -->
<!-- TODO: don't forget to update this in ../aggregate/*/associate.properties too (5 files)! -->
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target 2012-04-28 18:57:43 UTC (rev 40612)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target 2012-04-28 19:08:03 UTC (rev 40613)
@@ -9,7 +9,7 @@
<locations>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<!-- for trunk use _composite_/trunk; for 3.3_stable_branch, use _composite_/3.3.indigo -->
- <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+ <repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -339,4 +339,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
\ No newline at end of file
+</target>
Modified: branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml 2012-04-28 18:57:43 UTC (rev 40612)
+++ branches/jbosstools-3.3.0.Beta3/build/target-platform/multiple.target.p2mirror.xml 2012-04-28 19:08:03 UTC (rev 40613)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/"/>
+<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
<repository location="http://download.jboss.org/jbosstools/updates/indigo/SR2/"/>
</source>
<iu id="org.eclipse.m2e.sdk.feature.feature.group" version=""/>
13 years, 5 months
JBoss Tools SVN: r40612 - in trunk: as and 34 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-28 14:57:43 -0400 (Sat, 28 Apr 2012)
New Revision: 40612
Modified:
trunk/archives/pom.xml
trunk/as/pom.xml
trunk/birt/pom.xml
trunk/bpel/pom.xml
trunk/build/aggregate/pom.xml
trunk/build/parent/pom.xml
trunk/build/pom.xml
trunk/cdi/pom.xml
trunk/central/pom.xml
trunk/common/pom.xml
trunk/deltacloud/pom.xml
trunk/esb/pom.xml
trunk/examples/pom.xml
trunk/flow/pom.xml
trunk/forge/pom.xml
trunk/freemarker/pom.xml
trunk/gwt/pom.xml
trunk/hibernatetools/pom.xml
trunk/jbpm/pom.xml
trunk/jmx/pom.xml
trunk/jsf/pom.xml
trunk/jst/pom.xml
trunk/maven/pom.xml
trunk/modeshape/pom.xml
trunk/openshift/pom.xml
trunk/portlet/pom.xml
trunk/runtime-soa/pom.xml
trunk/runtime/pom.xml
trunk/seam/pom.xml
trunk/smooks/pom.xml
trunk/struts/pom.xml
trunk/tests/pom.xml
trunk/usage/pom.xml
trunk/vpe/pom.xml
trunk/ws/pom.xml
trunk/xulrunner/pom.xml
Log:
Use new Beta3 version of parent pom
Modified: trunk/archives/pom.xml
===================================================================
--- trunk/archives/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/archives/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/as/pom.xml
===================================================================
--- trunk/as/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/as/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/birt/pom.xml
===================================================================
--- trunk/birt/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/birt/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/bpel/pom.xml
===================================================================
--- trunk/bpel/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/bpel/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/build/aggregate/pom.xml
===================================================================
--- trunk/build/aggregate/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/build/aggregate/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/build/parent/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<name>JBoss Tools Parent</name>
<packaging>pom</packaging>
<modules>
@@ -18,7 +18,7 @@
<scmBranch>trunk</scmBranch>
<JBT_VERSION>3.3.0</JBT_VERSION>
<JBDS_VERSION>5.0.0</JBDS_VERSION>
- <BUILD_ALIAS>Beta3</BUILD_ALIAS>
+ <BUILD_ALIAS>CR1</BUILD_ALIAS>
<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
<memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>
<systemProperties></systemProperties>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/build/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/cdi/pom.xml
===================================================================
--- trunk/cdi/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/cdi/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/central/pom.xml
===================================================================
--- trunk/central/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/central/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/common/pom.xml
===================================================================
--- trunk/common/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/common/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/deltacloud/pom.xml
===================================================================
--- trunk/deltacloud/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/deltacloud/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/esb/pom.xml
===================================================================
--- trunk/esb/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/esb/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/examples/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/flow/pom.xml
===================================================================
--- trunk/flow/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/flow/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/forge/pom.xml
===================================================================
--- trunk/forge/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/forge/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/freemarker/pom.xml
===================================================================
--- trunk/freemarker/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/freemarker/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/gwt/pom.xml
===================================================================
--- trunk/gwt/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/gwt/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/hibernatetools/pom.xml
===================================================================
--- trunk/hibernatetools/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/hibernatetools/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jbpm/pom.xml
===================================================================
--- trunk/jbpm/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/jbpm/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jmx/pom.xml
===================================================================
--- trunk/jmx/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/jmx/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jsf/pom.xml
===================================================================
--- trunk/jsf/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/jsf/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/jst/pom.xml
===================================================================
--- trunk/jst/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/jst/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<packaging>pom</packaging>
Modified: trunk/maven/pom.xml
===================================================================
--- trunk/maven/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/maven/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/modeshape/pom.xml
===================================================================
--- trunk/modeshape/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/modeshape/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/openshift/pom.xml
===================================================================
--- trunk/openshift/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/openshift/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/portlet/pom.xml
===================================================================
--- trunk/portlet/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/portlet/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/runtime/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/runtime-soa/pom.xml
===================================================================
--- trunk/runtime-soa/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/runtime-soa/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/seam/pom.xml
===================================================================
--- trunk/seam/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/seam/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/smooks/pom.xml
===================================================================
--- trunk/smooks/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/smooks/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/struts/pom.xml
===================================================================
--- trunk/struts/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/struts/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/tests/pom.xml
===================================================================
--- trunk/tests/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/tests/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/usage/pom.xml
===================================================================
--- trunk/usage/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/usage/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/vpe/pom.xml
===================================================================
--- trunk/vpe/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/vpe/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/ws/pom.xml
===================================================================
--- trunk/ws/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/ws/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
Modified: trunk/xulrunner/pom.xml
===================================================================
--- trunk/xulrunner/pom.xml 2012-04-28 18:45:00 UTC (rev 40611)
+++ trunk/xulrunner/pom.xml 2012-04-28 18:57:43 UTC (rev 40612)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.Beta3-SNAPSHOT</version>
+ <version>3.3.0.CR1-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
13 years, 5 months
JBoss Tools SVN: r40611 - branches.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-28 14:45:00 -0400 (Sat, 28 Apr 2012)
New Revision: 40611
Added:
branches/jbosstools-3.3.0.Beta3/
Log:
branch for Beta3
13 years, 5 months
JBoss Tools SVN: r40610 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-28 12:12:02 -0400 (Sat, 28 Apr 2012)
New Revision: 40610
Modified:
trunk/build/aggregate/site/site.xml
Log:
typo. feature is sourcelookup, not sourcelokup. And apparently Tycho is super-strict about these things.
Modified: trunk/build/aggregate/site/site.xml
===================================================================
--- trunk/build/aggregate/site/site.xml 2012-04-28 12:22:58 UTC (rev 40609)
+++ trunk/build/aggregate/site/site.xml 2012-04-28 16:12:02 UTC (rev 40610)
@@ -187,7 +187,7 @@
<category name="AbridgedTools" />
<category name="MavenTools" />
</feature>
- <feature url="features/org.jboss.tools.maven.sourcelookup.feature_0.0.0.jar" id="org.jboss.tools.maven.sourcelokup.feature" version="0.0.0">
+ <feature url="features/org.jboss.tools.maven.sourcelookup.feature_0.0.0.jar" id="org.jboss.tools.maven.sourcelookup.feature" version="0.0.0">
<category name="AbridgedTools" />
<category name="MavenTools" />
</feature>
13 years, 5 months
JBoss Tools SVN: r40609 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5 and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-04-28 08:22:58 -0400 (Sat, 28 Apr 2012)
New Revision: 40609
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/AbstractQueryPage.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/JavaPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/JavaPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/console/ConsoleExtension3_6.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/JavaPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java
Log:
https://issues.jboss.org/browse/JBIDE-11522
Do not expose session class in parent interface as each hibernate version loads its own.
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/AbstractQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/AbstractQueryPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/AbstractQueryPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -37,7 +37,7 @@
protected PropertyChangeSupport pcs = new PropertyChangeSupport(this);
private int id;
- private Session session;
+ private Object session;
private final HibernateExtension extension;
protected List<Object> list;
protected long queryTime = -1; //shows how long query runs
@@ -93,11 +93,11 @@
this.sticky = sticky;
}
- public Session getSession() {
+ public Object getSession() {
return session;
}
- public void setSession(Session s) {
+ public void setSession(Object s) {
session = s;
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/QueryPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -72,8 +72,8 @@
*/
public abstract void setSticky(boolean b);
- public Session getSession();
- public void setSession(Session session);
+ public Object getSession();
+ public void setSession(Object session);
public HibernateExtension getHibernateExtension();
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HQLQueryPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -112,10 +112,11 @@
setTabName(getQueryString().replace('\n', ' ').replace('\r', ' ').replace('\t', ' '));
}
- public void setSession(Session s) {
+ @Override
+ public void setSession(Object s) {
super.setSession(s);
try {
- query = this.getSession().createQuery(getQueryString());
+ query = ((Session)this.getSession()).createQuery(getQueryString());
} catch (HibernateException e) {
addException(e);
} catch (Exception e) {
@@ -180,9 +181,9 @@
}
public void release() {
- if (getSession().isOpen() ) {
+ if (((Session)getSession()).isOpen() ) {
try {
- getSession().close();
+ ((Session)getSession()).close();
}
catch (HibernateException e) {
exceptions.add(e);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/JavaPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/JavaPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/JavaPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -63,7 +63,8 @@
}
@SuppressWarnings("unchecked")
- public void setSession(Session s) {
+ @Override
+ public void setSession(Object s) {
super.setSession(s);
try {
if(criteriaCode.indexOf( "System.exit" )>=0) { // TODO: externalize run so we don't need this bogus check! //$NON-NLS-1$
@@ -71,7 +72,7 @@
addException( new IllegalArgumentException(ConsoleMessages.JavaPage_not_allowed) );
return;
}
- ip = setupInterpreter(getSession() );
+ ip = setupInterpreter((Session)getSession() );
Object o = ip.eval(criteriaCode);
// ugly! TODO: make un-ugly!
if(o instanceof Criteria) {
@@ -159,9 +160,9 @@
}
public void release() {
- if (getSession().isOpen() ) {
+ if (((Session)getSession()).isOpen() ) {
try {
- getSession().close();
+ ((Session)getSession()).close();
}
catch (HibernateException e) {
exceptions.add(e);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/console/ConsoleExtension3_5.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -299,9 +299,9 @@
@Override
public IPropertySource getPropertySource(Object object,
QueryPage selectedQueryPage) {
- Session currentSession = selectedQueryPage.getSession();
+ Session currentSession = ((Session)selectedQueryPage.getSession());
if((currentSession.isOpen() && currentSession.contains(object)) || hasMetaData( object, currentSession) ) {
- return new EntityPropertySource(object, selectedQueryPage.getSession(), hibernateExtension);
+ return new EntityPropertySource(object, currentSession, hibernateExtension);
}
return null;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HQLQueryPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -112,10 +112,11 @@
setTabName(getQueryString().replace('\n', ' ').replace('\r', ' ').replace('\t', ' '));
}
- public void setSession(Session s) {
+ @Override
+ public void setSession(Object s) {
super.setSession(s);
try {
- query = this.getSession().createQuery(getQueryString());
+ query = ((Session)this.getSession()).createQuery(getQueryString());
} catch (HibernateException e) {
addException(e);
} catch (Exception e) {
@@ -180,9 +181,9 @@
}
public void release() {
- if (getSession().isOpen() ) {
+ if (((Session)getSession()).isOpen() ) {
try {
- getSession().close();
+ ((Session)getSession()).close();
}
catch (HibernateException e) {
exceptions.add(e);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/JavaPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/JavaPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/JavaPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -63,7 +63,8 @@
}
@SuppressWarnings("unchecked")
- public void setSession(Session s) {
+ @Override
+ public void setSession(Object s) {
super.setSession(s);
try {
if(criteriaCode.indexOf( "System.exit" )>=0) { // TODO: externalize run so we don't need this bogus check! //$NON-NLS-1$
@@ -71,7 +72,7 @@
addException( new IllegalArgumentException(ConsoleMessages.JavaPage_not_allowed) );
return;
}
- ip = setupInterpreter(getSession() );
+ ip = setupInterpreter((Session)getSession() );
Object o = ip.eval(criteriaCode);
// ugly! TODO: make un-ugly!
if(o instanceof Criteria) {
@@ -159,9 +160,9 @@
}
public void release() {
- if (getSession().isOpen() ) {
+ if (((Session)getSession()).isOpen() ) {
try {
- getSession().close();
+ ((Session)getSession()).close();
}
catch (HibernateException e) {
exceptions.add(e);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/console/ConsoleExtension3_6.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/console/ConsoleExtension3_6.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/console/ConsoleExtension3_6.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -318,9 +318,9 @@
@Override
public IPropertySource getPropertySource(Object object,
QueryPage selectedQueryPage) {
- Session currentSession = selectedQueryPage.getSession();
+ Session currentSession = (Session)selectedQueryPage.getSession();
if((currentSession.isOpen() && currentSession.contains(object)) || hasMetaData( object, currentSession) ) {
- return new EntityPropertySource(object, selectedQueryPage.getSession(), hibernateExtension);
+ return new EntityPropertySource(object, currentSession, hibernateExtension);
}
return null;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HQLQueryPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -30,6 +30,7 @@
import org.hibernate.HibernateException;
import org.hibernate.Query;
import org.hibernate.Session;
+import org.hibernate.SharedSessionContract;
import org.hibernate.console.AbstractQueryPage;
import org.hibernate.console.ConsoleQueryParameter;
import org.hibernate.console.QueryInputModel;
@@ -112,10 +113,11 @@
setTabName(getQueryString().replace('\n', ' ').replace('\r', ' ').replace('\t', ' '));
}
- public void setSession(Session s) {
+ @Override
+ public void setSession(Object s) {
super.setSession(s);
try {
- query = this.getSession().createQuery(getQueryString());
+ query = ((Session) this.getSession()).createQuery(getQueryString());
} catch (HibernateException e) {
addException(e);
} catch (Exception e) {
@@ -180,9 +182,9 @@
}
public void release() {
- if (getSession().isOpen() ) {
+ if (((Session)getSession()).isOpen() ) {
try {
- getSession().close();
+ ((Session)getSession()).close();
}
catch (HibernateException e) {
exceptions.add(e);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/JavaPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/JavaPage.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/JavaPage.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -63,7 +63,8 @@
}
@SuppressWarnings("unchecked")
- public void setSession(Session s) {
+ @Override
+ public void setSession(Object s) {
super.setSession(s);
try {
if(criteriaCode.indexOf( "System.exit" )>=0) { // TODO: externalize run so we don't need this bogus check! //$NON-NLS-1$
@@ -71,7 +72,7 @@
addException( new IllegalArgumentException(ConsoleMessages.JavaPage_not_allowed) );
return;
}
- ip = setupInterpreter(getSession() );
+ ip = setupInterpreter((Session)getSession() );
Object o = ip.eval(criteriaCode);
// ugly! TODO: make un-ugly!
if(o instanceof Criteria) {
@@ -159,9 +160,9 @@
}
public void release() {
- if (getSession().isOpen() ) {
+ if (((Session)getSession()).isOpen() ) {
try {
- getSession().close();
+ ((Session)getSession()).close();
}
catch (HibernateException e) {
exceptions.add(e);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2012-04-28 01:33:40 UTC (rev 40608)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/console/ConsoleExtension4_0.java 2012-04-28 12:22:58 UTC (rev 40609)
@@ -316,9 +316,9 @@
@Override
public IPropertySource getPropertySource(Object object,
QueryPage selectedQueryPage) {
- Session currentSession = selectedQueryPage.getSession();
+ Session currentSession = (Session)selectedQueryPage.getSession();
if((currentSession.isOpen() && currentSession.contains(object)) || hasMetaData( object, currentSession) ) {
- return new EntityPropertySource(object, selectedQueryPage.getSession(), hibernateExtension);
+ return new EntityPropertySource(object, currentSession, hibernateExtension);
}
return null;
}
13 years, 5 months