JBoss Tools SVN: r23487 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-07-16 03:50:43 -0400 (Fri, 16 Jul 2010)
New Revision: 23487
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
Log:
https://jira.jboss.org/browse/JBIDE-4858
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2010-07-16 07:49:07 UTC (rev 23486)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/MessagePropertyELSegmentImpl.java 2010-07-16 07:50:43 UTC (rev 23487)
@@ -24,7 +24,6 @@
private int propertyStart=0, propertyLength=0;
private String baseName=null;
- @Override
public IResource getMessageBundleResource() {
return messageBundleResource;
}
@@ -33,12 +32,10 @@
messageBundleResource = resource;
}
- @Override
public boolean isProperty() {
return messagePropertySourceReference != null;
}
- @Override
public ITextSourceReference getMessagePropertySourceReference() {
if(messagePropertySourceReference==null) {
messagePropertySourceReference = new ITextSourceReference() {
15 years, 9 months
JBoss Tools SVN: r23486 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2010-07-16 03:49:07 -0400 (Fri, 16 Jul 2010)
New Revision: 23486
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
Log:
https://jira.jboss.org/browse/JBIDE-6621
Ingres urls
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2010-07-16 03:33:08 UTC (rev 23485)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/DriverClassHelpers.java 2010-07-16 07:49:07 UTC (rev 23486)
@@ -27,8 +27,9 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
-import java.util.Map.Entry;
+import java.util.TreeMap;
/**
@@ -37,8 +38,8 @@
public class DriverClassHelpers {
private Map<String, String> dialectNames = new HashMap<String, String>();
- private Map<String, Set<String>> connectionUrls = new HashMap<String, Set<String>>();
- private Map<String, Set<String>> driverClasses = new HashMap<String, Set<String>>();
+ private Map<String, Set<String>> connectionUrls = new TreeMap<String, Set<String>>();
+ private Map<String, Set<String>> driverClasses = new TreeMap<String, Set<String>>();
private Map<String, String> driverToDialect = new HashMap<String, String>();
public DriverClassHelpers() {
@@ -93,6 +94,14 @@
"jdbc:h2:tcp://<server>[:<port>]/<databaseName>" //$NON-NLS-1$
}
);
+
+ addDriverAndURLS("org.hibernate.dialect.IngresDialect", //$NON-NLS-1$
+ "com.ingres.jdbc.IngresDriver", //$NON-NLS-1$
+ new String[] {
+ "jdbc:ingres://localhost:II7/demodb", //$NON-NLS-1$
+ "jdbc:ingres://<server>:<port>/<databaseName>", //$NON-NLS-1$
+ }
+ );
addDriverAndURLS("org.hibernate.dialect.OracleDialect", //$NON-NLS-1$
"oracle.jdbc.driver.OracleDriver", //$NON-NLS-1$
15 years, 9 months
JBoss Tools SVN: r23485 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 23:33:08 -0400 (Thu, 15 Jul 2010)
New Revision: 23485
Modified:
trunk/build/publish.sh
Log:
add input.dir variable
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-16 03:32:46 UTC (rev 23484)
+++ trunk/build/publish.sh 2010-07-16 03:33:08 UTC (rev 23485)
@@ -101,7 +101,7 @@
# generate HTML snippet, download-snippet.txt, for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
- ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
+ ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Dinput.dir=${STAGINGDIR} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
15 years, 9 months
JBoss Tools SVN: r23484 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 23:32:46 -0400 (Thu, 15 Jul 2010)
New Revision: 23484
Modified:
trunk/build/results/build.xml
Log:
use input.dir and output.dir; tweak debug settings
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2010-07-16 03:07:48 UTC (rev 23483)
+++ trunk/build/results/build.xml 2010-07-16 03:32:46 UTC (rev 23484)
@@ -11,15 +11,12 @@
<available file="${WORKSPACE}/results" />
</condition>
- <!-- <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}/../..">
- <available file="/home/hudson/static_build_env/jbds" type="dir" />
- </condition> -->
<condition property="WORKINGDIR" value="${WORKSPACE}/sources" else="${basedir}/../..">
<available file="${WORKSPACE}/sources" type="dir" />
</condition>
+ <property name="input.dir" value="${WORKINGDIR}" />
<mkdir dir="${WORKINGDIR}" />
- <echo level="info">WORKINGDIR = ${WORKINGDIR}</echo>
<condition property="COMMON_TOOLS" value="/home/hudson/static_build_env/jbds/tools">
<available file="/home/hudson/static_build_env/jbds" type="dir" />
@@ -28,7 +25,6 @@
<available file="${WORKINGDIR}/../tools" type="dir" />
</condition>
<mkdir dir="${COMMON_TOOLS}" />
- <echo level="info">COMMON_TOOLS = ${COMMON_TOOLS}</echo>
<condition property="build.xml" value="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml">
<available file="/home/hudson/static_build_env/jbds/tools/sources/build/build.xml" type="file" />
@@ -91,11 +87,14 @@
3. manually copy the contents of this file into a page under
http://www.jboss.org/tools/downloads/
-->
- <echo level="info">output.dir = ${output.dir}
-ZIPSUFFIX = ${ZIPSUFFIX}</echo>
+ <echo level="info">ZIPSUFFIX = ${ZIPSUFFIX}
+WORKINGDIR = ${WORKINGDIR}
+COMMON_TOOLS = ${COMMON_TOOLS}
+input.dir = ${input.dir}
+output.dir = ${output.dir}</echo>
<for param="UPDATEZIP">
<path>
- <fileset dir="${output.dir}">
+ <fileset dir="${input.dir}">
<include name="**/*-Update-${ZIPSUFFIX}.zip" />
<include name="**/*-Sources-${ZIPSUFFIX}.zip" />
</fileset>
15 years, 9 months
JBoss Tools SVN: r23483 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 23:07:48 -0400 (Thu, 15 Jul 2010)
New Revision: 23483
Modified:
trunk/build/results/build.xml
Log:
debug
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2010-07-16 03:03:56 UTC (rev 23482)
+++ trunk/build/results/build.xml 2010-07-16 03:07:48 UTC (rev 23483)
@@ -91,6 +91,8 @@
3. manually copy the contents of this file into a page under
http://www.jboss.org/tools/downloads/
-->
+ <echo level="info">output.dir = ${output.dir}
+ZIPSUFFIX = ${ZIPSUFFIX}</echo>
<for param="UPDATEZIP">
<path>
<fileset dir="${output.dir}">
@@ -145,14 +147,11 @@
<property name="${COMPONENT}-filename" value="${filename}" />
<get.size file="@{UPDATEZIP}" property="${COMPONENT}-filesize" />
-
- <!--
<var name="filesize" unset="true" />
<propertycopy from="${COMPONENT}-filesize" property="filesize" override="true" silent="true" />
<echo level="info">filesize = ${filesize}</echo>
<echo level="info">filename = ${filename}</echo>
<var name="filesize" unset="true" />
- -->
<var name="filename" unset="true" />
</sequential>
</for>
15 years, 9 months
JBoss Tools SVN: r23482 - trunk/build/component.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 23:03:56 -0400 (Thu, 15 Jul 2010)
New Revision: 23482
Added:
trunk/build/component/drools.xml
trunk/build/component/drools.xml.README.txt
Log:
add component builder for drools
Added: trunk/build/component/drools.xml
===================================================================
--- trunk/build/component/drools.xml (rev 0)
+++ trunk/build/component/drools.xml 2010-07-16 03:03:56 UTC (rev 23482)
@@ -0,0 +1,15 @@
+<project
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.build.component</groupId>
+ <artifactId>common</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <modules>
+ <module>../../tests</module>
+ <module>../../common</module>
+ <module>../../jst</module>
+ <module>../../flow</module>
+ <module>../../drools</module>
+ </modules>
+</project>
Added: trunk/build/component/drools.xml.README.txt
===================================================================
--- trunk/build/component/drools.xml.README.txt (rev 0)
+++ trunk/build/component/drools.xml.README.txt 2010-07-16 03:03:56 UTC (rev 23482)
@@ -0,0 +1,9 @@
+To build drools, you first need to run the build.xml script:
+
+$ cd ../../drools; ant
+
+Then run maven:
+
+$ cd ../build/component; mvn clean install -f drools.xml
+
+
15 years, 9 months
JBoss Tools SVN: r23481 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 22:52:42 -0400 (Thu, 15 Jul 2010)
New Revision: 23481
Modified:
trunk/build/publish.sh
Log:
add missing ant var to call to results/build.xml
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-16 02:46:14 UTC (rev 23480)
+++ trunk/build/publish.sh 2010-07-16 02:52:42 UTC (rev 23481)
@@ -101,7 +101,7 @@
# generate HTML snippet, download-snippet.txt, for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
- ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs -DWORKINGDIR=${WORKSPACE}/sources"
+ ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs -DWORKSPACE=${WORKSPACE}"
if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
15 years, 9 months
JBoss Tools SVN: r23480 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 22:46:14 -0400 (Thu, 15 Jul 2010)
New Revision: 23480
Modified:
trunk/build/publish.sh
Log:
add missing ant var to call to results/build.xml
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2010-07-16 01:10:57 UTC (rev 23479)
+++ trunk/build/publish.sh 2010-07-16 02:46:14 UTC (rev 23480)
@@ -101,7 +101,7 @@
# generate HTML snippet, download-snippet.txt, for inclusion on jboss.org
if [[ ${RELEASE} == "Yes" ]]; then
mkdir -p ${STAGINGDIR}/logs
- ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs"
+ ANT_PARAMS="-v -DZIPSUFFIX=${ZIPSUFFIX} -DJOB_NAME=${JOB_NAME} -Doutput.dir=${STAGINGDIR}/logs -DWORKINGDIR=${WORKSPACE}/sources"
if [[ -f ${WORKSPACE}/build/results/build.xml ]]; then
ant -f ${WORKSPACE}/build/results/build.xml ${ANT_PARAMS}
elif [[ -f ${WORKSPACE}/sources/build/results/build.xml ]]; then
15 years, 9 months
JBoss Tools SVN: r23479 - trunk/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 21:10:57 -0400 (Thu, 15 Jul 2010)
New Revision: 23479
Modified:
trunk/build/results/build.xml
Log:
use output.dir as input for where to look for update site zips
Modified: trunk/build/results/build.xml
===================================================================
--- trunk/build/results/build.xml 2010-07-16 01:01:45 UTC (rev 23478)
+++ trunk/build/results/build.xml 2010-07-16 01:10:57 UTC (rev 23479)
@@ -93,9 +93,9 @@
-->
<for param="UPDATEZIP">
<path>
- <fileset dir="${WORKINGDIR}/site">
- <include name="*-Update-${ZIPSUFFIX}.zip" />
- <include name="*-Sources-${ZIPSUFFIX}.zip" />
+ <fileset dir="${output.dir}">
+ <include name="**/*-Update-${ZIPSUFFIX}.zip" />
+ <include name="**/*-Sources-${ZIPSUFFIX}.zip" />
</fileset>
</path>
<sequential>
15 years, 9 months
JBoss Tools SVN: r23478 - branches/jbosstools-3.2.0.M1/build/results.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-07-15 21:01:45 -0400 (Thu, 15 Jul 2010)
New Revision: 23478
Modified:
branches/jbosstools-3.2.0.M1/build/results/build.xml
Log:
use alternate path for default when searching for components
Modified: branches/jbosstools-3.2.0.M1/build/results/build.xml
===================================================================
--- branches/jbosstools-3.2.0.M1/build/results/build.xml 2010-07-16 01:01:38 UTC (rev 23477)
+++ branches/jbosstools-3.2.0.M1/build/results/build.xml 2010-07-16 01:01:45 UTC (rev 23478)
@@ -11,8 +11,11 @@
<available file="${WORKSPACE}/results" />
</condition>
- <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}/../..">
+ <!-- <condition property="WORKINGDIR" value="/home/hudson/static_build_env/jbds/tools/sources" else="${basedir}/../..">
<available file="/home/hudson/static_build_env/jbds" type="dir" />
+ </condition> -->
+ <condition property="WORKINGDIR" value="${WORKSPACE}/sources" else="${basedir}/../..">
+ <available file="${WORKSPACE}/sources" type="dir" />
</condition>
<mkdir dir="${WORKINGDIR}" />
15 years, 9 months