JBoss Tools SVN: r21408 - branches/modular_build.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-04-10 04:13:36 -0400 (Sat, 10 Apr 2010)
New Revision: 21408
Modified:
branches/modular_build/genpom.scala
Log:
target platform generation is added
Modified: branches/modular_build/genpom.scala
===================================================================
--- branches/modular_build/genpom.scala 2010-04-10 08:10:27 UTC (rev 21407)
+++ branches/modular_build/genpom.scala 2010-04-10 08:13:36 UTC (rev 21408)
@@ -30,6 +30,8 @@
def generateModule(dir : File, parentPom : File, parent : GVA, me : GVA) {
modulecount = modulecount + 1
+
+
var module =
<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>
@@ -47,16 +49,75 @@
else if (dir.getParentFile().getAbsolutePath().endsWith("/features") || dir.getParentFile().getAbsolutePath().endsWith("/features/."))
"eclipse-feature"
else
- "eclipse-plugin"}</packaging>
- </project>;
-
+ "eclipse-plugin"}</packaging>
+ { getTarget(dir) }
+ </project>;
+
val pp = new scala.xml.PrettyPrinter(80,2)
-
writePom("Module ", pp.format(module), dir)
}
+ def getTarget(dir : File) : Object ={
+ var env = <environment/>;
+
+ if (dir.getAbsolutePath().endsWith("gtk.linux.x86")) {
+ env = <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>;
+ } else if (dir.getAbsolutePath().endsWith("gtk.linux.x86_64")) {
+ env = <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>;
+ } else if (dir.getAbsolutePath().endsWith("carbon.macosx")) {
+ env = <environment>
+ <os>macosx</os>
+ <ws>carbon</ws>
+ <arch>x86</arch>
+ </environment>;
+ } else if (dir.getAbsolutePath().endsWith("cocoa.macosx")) {
+ env = <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86</arch>
+ </environment>;
+ } else if (dir.getAbsolutePath().endsWith("win32.win32.x86")) {
+ env = <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>;
+ }
+
+ var target = <build>
+ <plugins>
+ <plugin>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${{tychoVersion}}</version>
+ <configuration>
+ <resolver>p2</resolver>
+ <environments>
+ { env }
+ </environments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>;
+
+ if(dir.getAbsolutePath().endsWith("x86_64")
+ || dir.getAbsolutePath().endsWith("x86")
+ || dir.getAbsolutePath().endsWith("macosx")) {
+ return target
+ }
+ return ""
+ }
+
def writePom(n : String, pp : String, dir : File) {
val pomxml = new File(dir, "pom.xml")
14 years, 9 months
JBoss Tools SVN: r21406 - branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-04-10 03:59:40 -0400 (Sat, 10 Apr 2010)
New Revision: 21406
Modified:
branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
Log:
xulrunner build fix
Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml
===================================================================
--- branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-04-10 07:58:07 UTC (rev 21405)
+++ branches/modular_build/xulrunner/features/org.mozilla.xulrunner.feature/feature.xml 2010-04-10 07:59:40 UTC (rev 21406)
@@ -18,7 +18,17 @@
</license>
<plugin
+ id="org.mozilla.xpcom"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.mozilla.xulrunner.win32.win32.x86"
+ os="win32"
+ ws="win32"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
@@ -26,6 +36,9 @@
<plugin
id="org.mozilla.xulrunner.gtk.linux.x86_64"
+ os="linux"
+ ws="gtk"
+ arch="x86_64"
download-size="0"
install-size="0"
version="0.0.0"
@@ -33,6 +46,9 @@
<plugin
id="org.mozilla.xulrunner.gtk.linux.x86"
+ os="linux"
+ ws="gtk"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
@@ -40,6 +56,8 @@
<plugin
id="org.mozilla.xulrunner.cocoa.macosx"
+ os="macosx"
+ ws="cocoa"
download-size="0"
install-size="0"
version="0.0.0"
@@ -47,6 +65,9 @@
<plugin
id="org.mozilla.xulrunner.carbon.macosx"
+ os="macosx"
+ ws="carmon"
+ arch="x86"
download-size="0"
install-size="0"
version="0.0.0"
14 years, 9 months
JBoss Tools SVN: r21405 - branches/modular_build/xulrunner/features/org.mozilla.xulrunner.site.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-04-10 03:58:07 -0400 (Sat, 10 Apr 2010)
New Revision: 21405
Modified:
branches/modular_build/xulrunner/features/org.mozilla.xulrunner.site/site.xml
Log:
Modified: branches/modular_build/xulrunner/features/org.mozilla.xulrunner.site/site.xml
===================================================================
--- branches/modular_build/xulrunner/features/org.mozilla.xulrunner.site/site.xml 2010-04-09 21:31:53 UTC (rev 21404)
+++ branches/modular_build/xulrunner/features/org.mozilla.xulrunner.site/site.xml 2010-04-10 07:58:07 UTC (rev 21405)
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.mozilla.xpcom.feature_1.9.1.2a.jar" id="org.mozilla.xpcom.feature" version="1.9.1.2a"/>
- <feature url="features/org.mozilla.xulrunner.feature_1.9.1.2.jar" id="org.mozilla.xulrunner.feature" version="1.9.1.2"/>
+ <feature url="features/org.mozilla.xulrunner.feature_0.0.0.jar" id="org.mozilla.xulrunner.feature" version="0.0.0"/>
</site>
14 years, 9 months
JBoss Tools SVN: r21403 - branches/modular_build/esb/tests/org.jboss.tools.esb.project.core.test/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-04-09 15:13:14 -0400 (Fri, 09 Apr 2010)
New Revision: 21403
Modified:
branches/modular_build/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
Log:
JBDS-486 add missing test dep
Modified: branches/modular_build/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF
===================================================================
--- branches/modular_build/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-04-09 16:33:55 UTC (rev 21402)
+++ branches/modular_build/esb/tests/org.jboss.tools.esb.project.core.test/META-INF/MANIFEST.MF 2010-04-09 19:13:14 UTC (rev 21403)
@@ -6,6 +6,7 @@
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit;bundle-version="3.8.2",
+ org.jboss.tools.tests,
org.jboss.tools.esb.project.core;bundle-version="1.0.0",
org.eclipse.wst.common.project.facet.core;bundle-version="1.4.0",
org.eclipse.wst.server.core;bundle-version="1.1.101",
14 years, 9 months
JBoss Tools SVN: r21401 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-04-09 11:43:09 -0400 (Fri, 09 Apr 2010)
New Revision: 21401
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/PaymentService.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2708 Added test for J2EE resource validation.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/PaymentService.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/PaymentService.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/PaymentService.java 2010-04-09 15:43:09 UTC (rev 21401)
@@ -0,0 +1,5 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.resources;
+
+public class PaymentService {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/PaymentService.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java 2010-04-09 15:43:09 UTC (rev 21401)
@@ -0,0 +1,33 @@
+package org.jboss.jsr299.tck.tests.jbt.validation.resources;
+
+import javax.annotation.Resource;
+import javax.ejb.EJB;
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.xml.ws.WebServiceRef;
+
+public class ProducerFieldsBroken {
+
+ @Named
+ @Produces @Resource //(lookup="java:global/env/jdbc/CustomerDatasource")
+ Object customerDatabaseResourceBroken;
+
+ @Named("service")
+ @Produces @WebServiceRef(lookup="java:app/service/PaymentService")
+ PaymentService paymentServiceResourceBroken;
+
+ @Named
+ @Produces @EJB //(ejbLink="../their.jar#PaymentService")
+ PaymentService paymentServiceEjbResourceBroken;
+
+ @Named
+ @Produces @PersistenceContext(unitName="CustomerDatabase")
+ EntityManager customerDatabasePersistenceContextResourceBroken;
+
+ @Named @Produces @PersistenceUnit(unitName="CustomerDatabase")
+ EntityManagerFactory customerDatabasePersistenceUnitResourceBroken;
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-04-09 15:05:28 UTC (rev 21400)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-04-09 15:43:09 UTC (rev 21401)
@@ -19,14 +19,7 @@
*/
public class ValidationTest extends TCKTest {
- public void testLegalTypesInTyped() throws Exception {
- IFile petShopFile = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java");
- AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean", 25);
- int markerNumbers = getMarkersNumber(petShopFile);
- assertEquals("PetShop.java should has the only error marker.", markerNumbers, 1);
- }
-
- /*
+ /**
* 2.7.1.3. Stereotype declares a non-empty @Named annotation (Non-Portable behavior)
*/
public void testNonEmptyNamedForStereotype() throws Exception {
@@ -36,7 +29,29 @@
assertEquals("StereotypeWithNonEmptyNamed_Broken.java should has the only error marker.", markerNumbers, 1);
}
- /*
+ /**
+ * 3.5.1. Declaring a resource
+ * - producer field declaration specifies an EL name (together with one of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef)
+ *
+ * @throws Exception
+ */
+ public void testResourceWithELName() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/resources/ProducerFieldsBroken.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 15);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 19);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 23);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 27);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, "Producer field declaration of Java EE resource specifies an EL name", 31);
+ }
+
+ public void testLegalTypesInTyped() throws Exception {
+ IFile petShopFile = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/PetShop.java");
+ AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractResourceMarkerTest.MARKER_TYPE, "Bean class or producer method or field specifies a @Typed annotation, and the value member specifies a class which does not correspond to a type in the unrestricted set of bean types of a bean", 25);
+ int markerNumbers = getMarkersNumber(petShopFile);
+ assertEquals("PetShop.java should has the only error marker.", markerNumbers, 1);
+ }
+
+ /**
* 2.7.1.3. Stereotype declares any other qualifier annotation
*/
public void testAnnotatedStereotype() throws Exception {
@@ -46,7 +61,7 @@
assertEquals("StereotypeWithBindingTypes_Broken.java should has the only error marker.", markerNumbers, 1);
}
- /*
+ /**
* 2.7.1.3. Stereotype is annotated @Typed
*/
public void testTypedStereotype() throws Exception {
@@ -56,7 +71,7 @@
assertEquals("StereotypeWithTyped_Broken.java should has the only error marker.", markerNumbers, 1);
}
- /*
+ /**
* 2.7.1.1. Declaring the default scope for a stereotype
* - stereotype declares more than one scope
*/
@@ -67,7 +82,7 @@
assertEquals("StereotypeWithTooManyScopeTypes_Broken.java should has two error markers.", markerNumbers, 2);
}
- /*
+ /**
* 2.4.3. Declaring the bean scope
* - bean class or producer method or field specifies multiple scope type annotations
*/
@@ -78,7 +93,7 @@
assertEquals("StereotypeWithTyped_Broken.java should has two error markers.", markerNumbers, 2);
}
- /*
+ /**
* 2.4.4. Default scope
* - bean does not explicitly declare a scope when there is no default scope
* (there are two different stereotypes declared by the bean that declare different default scopes)
14 years, 9 months
JBoss Tools SVN: r21400 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: resources/tck/tests/jbt and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-04-09 11:05:28 -0400 (Fri, 09 Apr 2010)
New Revision: 21400
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/MaxNumber.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Random.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/resources/
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/refactoring/
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java
Log:
Moved CDI Refactoring test project resources to jbt package.
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java 2010-04-09 15:05:28 UTC (rev 21400)
@@ -0,0 +1,97 @@
+package org.jboss.jsr299.tck.tests.jbt.refactoring;
+
+import java.io.Serializable;
+
+//import javax.annotation.PostConstruct;
+import javax.enterprise.context.SessionScoped;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.naming.NamingException;
+
+@SessionScoped
+@Named
+public class Game implements Serializable
+{
+ private static final long serialVersionUID = 12L;
+
+ @Named("myInner")
+ public static class MyInner {
+
+ }
+ private int number;
+ private int guess;
+ private int smallest;
+ private int biggest;
+ private int remainingGuesses;
+
+ @Inject @MaxNumber private int maxNumber;
+
+ @Inject private int[] maxNumber2;
+
+ @Inject Generator[] generator;
+
+ @Inject @Random Instance<Integer> randomNumber;
+
+ public Game() throws NamingException {}
+
+ public int getNumber()
+ {
+ return number + 9;
+ }
+
+ public int getGuess()
+ {
+ return guess;
+ }
+
+ public void setGuess(int guess)
+ {
+ String s = "#{another.kkk}";
+ this.guess = guess;
+ }
+
+ public int getSmallest()
+ {
+ return smallest;
+ }
+
+ public int getBiggest()
+ {
+ return biggest;
+ }
+
+ public int getRemainingGuesses()
+ {
+ return remainingGuesses;
+ }
+
+ public boolean check()
+ {
+ if (guess>number)
+ {
+ biggest = guess - 1;
+ }
+ if (guess<number)
+ {
+ smallest = guess + 1;
+ }
+ remainingGuesses--;
+ return (guess == number);
+ }
+
+// @PostConstruct
+ public void reset()
+ {
+ this.smallest = 0;
+ this.guess = 0;
+ this.remainingGuesses = 10;
+ this.biggest = maxNumber;
+ this.number = randomNumber.get();
+ }
+}
+
+@Named("myLocal")
+class MyLocal {
+
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Game.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java 2010-04-09 15:05:28 UTC (rev 21400)
@@ -0,0 +1,38 @@
+package org.jboss.jsr299.tck.tests.jbt.refactoring;
+
+import java.io.Serializable;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Produces;
+import javax.inject.Named;
+
+@ApplicationScoped
+public class Generator implements Serializable
+{
+ private static final long serialVersionUID = -7213673465118041882L;
+
+ private java.util.Random random = new java.util.Random(System.currentTimeMillis());
+
+ private int maxNumber = 100;
+
+ java.util.Random getRandom()
+ {
+ String s = "#{game}";
+ return random;
+ }
+
+ @Produces @Random int next()
+ {
+ return getRandom().nextInt(maxNumber);
+ }
+
+ @Produces @MaxNumber int getMaxNumber()
+ {
+ return maxNumber;
+ }
+}
+
+@Named("another")
+class AnotherOne {
+
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Generator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml 2010-04-09 15:05:28 UTC (rev 21400)
@@ -0,0 +1,28 @@
+<html xmlns:h="http://java.sun.com/jsf/html">
+ <head>
+ <title>Wicket Weld example</title>
+ </head>
+ <body>
+ <h1>Guess a number...</h1>
+ <form wicket:id="NumberGuessMain">
+ <div style="color: red">
+ <span wicket:id="messages#{myInner}"/>
+ </div>
+
+ <div wicket:id="prompt">
+ I'm thinking of a number between 0 and 100. You have 10 guesses.
+ </div>
+
+ <div>
+ <span wicket:id="guessLabel">Your guess:</span>
+ <input wicket:id="inputGuess" type="text" size="3"/>
+ <input wicket:id="GuessButton" type="submit" value="Guess"/>
+ <input wicket:id="RestartButton" type="submit" value="Reset"/>
+ <h:commandButton id="GuessButton" value="Guess" action="#{game.check}" disabled="false"/>
+ </div>
+ <div>
+ <h:commandButton id="RestartButton" value="Reset" action="#{game.reset}" immediate="true"/>
+ </div>
+ </form>
+ </body>
+</html>
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/HomePage.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/MaxNumber.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/MaxNumber.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/MaxNumber.java 2010-04-09 15:05:28 UTC (rev 21400)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.refactoring;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface MaxNumber
+{
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/MaxNumber.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Random.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Random.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Random.java 2010-04-09 15:05:28 UTC (rev 21400)
@@ -0,0 +1,21 @@
+package org.jboss.jsr299.tck.tests.jbt.refactoring;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
+@Documented
+@Qualifier
+public @interface Random
+{
+}
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/Random.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp 2010-04-09 15:05:28 UTC (rev 21400)
@@ -0,0 +1,19 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+
+<f:loadBundle var="Message" basename="demo.Messages" />
+
+<html>
+ <head>
+ <title>Hello!</title>
+ </head>
+
+ <body>
+ <f:view>
+ <h3>
+ <h:outputText value="#{game.biggest}" />!
+ </h3>
+ </f:view>
+ </body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/refactoring/index.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2010-04-09 14:01:58 UTC (rev 21399)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/NamedBeanRefactoringTest.java 2010-04-09 15:05:28 UTC (rev 21400)
@@ -17,9 +17,9 @@
import org.jboss.tools.tests.AbstractRefactorTest;
public class NamedBeanRefactoringTest extends AbstractRefactorTest {
- private static final String PROJECT_NAME = "/tests/refactoring";
- private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/refactoring/Game.java";
- private static final String FILE_NAME2 = "JavaSource/org/jboss/jsr299/tck/tests/refactoring/Generator.java";
+ private static final String PROJECT_NAME = "/tests/jbt/refactoring";
+ private static final String FILE_NAME1 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Game.java";
+ private static final String FILE_NAME2 = "JavaSource/org/jboss/jsr299/tck/tests/jbt/refactoring/Generator.java";
private static final String FILE_NAME3 = "WebContent/HomePage.xhtml";
private static final String FILE_NAME4 = "WebContent/index.jsp";
static IProject project;
@@ -44,12 +44,12 @@
TestChangeStructure structure = new TestChangeStructure(project
.getProject(), FILE_NAME1);
- TestTextChange change = new TestTextChange(324, 4, newName);
+ TestTextChange change = new TestTextChange(328, 4, newName);
structure.addTextChange(change);
list.add(structure);
structure = new TestChangeStructure(project, FILE_NAME2);
- change = new TestTextChange(522, 4, newName);
+ change = new TestTextChange(526, 4, newName);
structure.addTextChange(change);
list.add(structure);
14 years, 9 months
JBoss Tools SVN: r21399 - branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-04-09 10:01:58 -0400 (Fri, 09 Apr 2010)
New Revision: 21399
Modified:
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateProxyHelperStub.java
branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/SessionFactoryStub.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-6070 - create/invoke by string name - for all classes 2
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateProxyHelperStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateProxyHelperStub.java 2010-04-09 13:57:31 UTC (rev 21398)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/HibernateProxyHelperStub.java 2010-04-09 14:01:58 UTC (rev 21399)
@@ -6,6 +6,6 @@
public static final String CL = "org.hibernate.proxy.HibernateProxyHelper"; //$NON-NLS-1$
public static Class<?> getClassWithoutInitializingProxy(Object object) {
- return (Class<?>)HObject.invokeStaticMethod(CL, "getClassWithoutInitializingProxy"); //$NON-NLS-1$
+ return (Class<?>)HObject.invokeStaticMethod(CL, "getClassWithoutInitializingProxy", object); //$NON-NLS-1$
}
}
Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/SessionFactoryStub.java
===================================================================
--- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/SessionFactoryStub.java 2010-04-09 13:57:31 UTC (rev 21398)
+++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/stubs/SessionFactoryStub.java 2010-04-09 14:01:58 UTC (rev 21399)
@@ -153,14 +153,26 @@
}
public ClassMetadataStub getClassMetadata(String entityName) {
- return new ClassMetadataStub(invoke(mn(), entityName));
+ Object obj = invoke(mn(), entityName);
+ if (obj == null) {
+ return null;
+ }
+ return new ClassMetadataStub(obj);
}
public CollectionMetadataStub getCollectionMetadata(String roleName) {
- return new CollectionMetadataStub(invoke(mn(), roleName));
+ Object obj = invoke(mn(), roleName);
+ if (obj == null) {
+ return null;
+ }
+ return new CollectionMetadataStub(obj);
}
public ClassMetadataStub getClassMetadata(Class<?> classWithoutInitializingProxy) {
- return new ClassMetadataStub(invoke(mn(), classWithoutInitializingProxy));
+ Object obj = invoke(mn(), classWithoutInitializingProxy);
+ if (obj == null) {
+ return null;
+ }
+ return new ClassMetadataStub(obj);
}
}
14 years, 9 months
JBoss Tools SVN: r21398 - in trunk/vpe: tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yzhishko
Date: 2010-04-09 09:57:31 -0400 (Fri, 09 Apr 2010)
New Revision: 21398
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html
trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-6168 - fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2010-04-09 13:38:04 UTC (rev 21397)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.html/templates/vpe-templates-html.xml 2010-04-09 13:57:31 UTC (rev 21398)
@@ -1422,7 +1422,7 @@
<vpe:tag name="object" case-sensitive="no">
<vpe:template children="yes" modify="no">
<vpe:copy
- attrs="align,classid,code,codebase,codetype,data,height,hspace,type,vspace,width,class,id,dir" />
+ attrs="align,code,codebase,codetype,data,height,hspace,type,vspace,width,class,id,dir" />
<vpe:dnd>
<vpe:drop container="yes">
<vpe:container-child tag-name="param" />
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html 2010-04-09 13:38:04 UTC (rev 21397)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html 2010-04-09 13:57:31 UTC (rev 21398)
@@ -5,7 +5,7 @@
<h1>object</h1>
-<object id="object" classid="someClass" width="500" height="200" align="top"
+<object id="object" width="500" height="200" align="top"
border="10" class="objectClass" dir="ltr" id="object"
style="color: red;" vspace="10">
<param name="someParam" value="5">
Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html.xml 2010-04-09 13:38:04 UTC (rev 21397)
+++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/resources/htmlTest/WebContent/pages/components/core/object.html.xml 2010-04-09 13:57:31 UTC (rev 21398)
@@ -1,7 +1,7 @@
<tests>
<test id="object">
<OBJECT WIDTH="500" VSPACE="10" HEIGHT="200" ALIGN="top"
- CLASSID="someClass" STYLE="-moz-user-modify: read-only;" >
+ STYLE="-moz-user-modify: read-only;" >
</OBJECT>
</test>
</tests>
\ No newline at end of file
14 years, 9 months
JBoss Tools SVN: r21397 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: abogachuk
Date: 2010-04-09 09:38:04 -0400 (Fri, 09 Apr 2010)
New Revision: 21397
Modified:
trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-1143 Jboss AS docs mistakes.
Text was corrected.
Modified: trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2010-04-09 13:13:14 UTC (rev 21396)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/jsp_application.xml 2010-04-09 13:38:04 UTC (rev 21397)
@@ -392,8 +392,8 @@
Studio</property>. You can do it by performing one of the following actions:</para>
<itemizedlist>
<listitem>
- <para>Start JBoss Server from JBoss
- Server view by clicking the Start the server icon (
+ <para>Start JBoss Server from
+ Servers view by clicking the Start the server icon (
<inlinemediaobject>
<imageobject>
<imagedata fileref="images/jsp_application/jsp_application_18.png"/>
14 years, 9 months