[jboss-cvs] JBossAS SVN: r60920 - in trunk: ejb3x and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2007-02-26 16:11:33 -0500 (Mon, 26 Feb 2007)
New Revision: 60920

Added:
   trunk/tools/lib/org.eclipse.jdt.core_3.2.3.v_686_R32x.jar
Removed:
   trunk/tools/lib/org.eclipse.jdt.core_3.1.0.jar
Modified:
   trunk/ejb3/build.xml
   trunk/ejb3x/build.xml
   trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
   trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
   trunk/tools/lib/jdtCompilerAdapter.jar
Log:
Update to eclipse-3.2.2 compiler
Fix <call-property> handling



Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml	2007-02-26 19:47:27 UTC (rev 60919)
+++ trunk/ejb3/build.xml	2007-02-26 21:11:33 UTC (rev 60920)
@@ -93,6 +93,7 @@
          <path refid="junit.junit.classpath"/>
          <path refid="jboss.remoting.classpath"/>
          <path refid="apache.logging.classpath"/>
+         <path refid="jboss.security.spi.classpath"/>
          <path refid="jboss.serialization.classpath"/>
          <path refid="jboss.microcontainer.classpath"/>
          <path refid="jboss.jboss.vfs.classpath"/>

Modified: trunk/ejb3x/build.xml
===================================================================
--- trunk/ejb3x/build.xml	2007-02-26 19:47:27 UTC (rev 60919)
+++ trunk/ejb3x/build.xml	2007-02-26 21:11:33 UTC (rev 60920)
@@ -164,9 +164,10 @@
   <target name="compile-classes" depends="init">
     <mkdir dir="${build.classes}"/>
     <javac destdir="${build.classes}"
-           optimize="${javac.optimize}"
-           source="1.5"
-           debug="${javac.debug}"
+       optimize="${javac.optimize}"
+       target="1.5"
+       source="1.5"
+       debug="${javac.debug}"
 	   depend="${javac.depend}"
 	   verbose="${javac.verbose}"
 	   deprecation="${javac.deprecation}"

Modified: trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2007-02-26 19:47:27 UTC (rev 60919)
+++ trunk/server/src/main/org/jboss/metadata/DDObjectFactory.java	2007-02-26 21:11:33 UTC (rev 60920)
@@ -447,6 +447,18 @@
       return child;
    }
 
+   public void setValue(NameValuePair ref, UnmarshallingContext navigator, String namespaceURI, String localName, String value)
+   {
+      if (localName.equals("prop-name"))
+      {
+         ref.setName(value);
+      }
+      else if (localName.equals("prop-value"))
+      {
+         ref.setValue(value);
+      }
+   }
+   
    public void addChild(PortComponentRefMetaData parent, NameValuePair property, UnmarshallingContext navigator, String namespaceURI, String localName)
    {
       parent.addCallProperty(property.getName(), property.getValue());

Modified: trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java
===================================================================
--- trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java	2007-02-26 19:47:27 UTC (rev 60919)
+++ trunk/server/src/main/org/jboss/metadata/serviceref/PortComponentRefMetaData.java	2007-02-26 21:11:33 UTC (rev 60920)
@@ -45,10 +45,9 @@
    private String serviceEndpointInterface;
    // The optional <port-component-link> element
    private String portComponentLink;
+   // Arbitrary proxy properties given by <call-property> 
+   private Properties callProperties = new Properties();
 
-   /** Arbitrary proxy properties given by <call-property> */
-   private Properties callProperties;
-
    public PortComponentRefMetaData(ServiceRefMetaData serviceRefMetaData)
    {
       this.serviceRefMetaData = serviceRefMetaData;
@@ -108,7 +107,6 @@
    public void importStandardXml(Element element)
    {
       serviceEndpointInterface = MetaData.getUniqueChildContent(element, "service-endpoint-interface");
-
       portComponentLink = MetaData.getOptionalChildContent(element, "port-component-link");
    }
 
@@ -121,8 +119,6 @@
          Element propElement = (Element)iterator.next();
          String name = MetaData.getUniqueChildContent(propElement, "prop-name");
          String value = MetaData.getUniqueChildContent(propElement, "prop-value");
-         if (callProperties == null)
-            callProperties = new Properties();
          callProperties.setProperty(name, value);
       }
 

Modified: trunk/tools/lib/jdtCompilerAdapter.jar
===================================================================
(Binary files differ)

Deleted: trunk/tools/lib/org.eclipse.jdt.core_3.1.0.jar
===================================================================
(Binary files differ)

Added: trunk/tools/lib/org.eclipse.jdt.core_3.2.3.v_686_R32x.jar
===================================================================
(Binary files differ)


Property changes on: trunk/tools/lib/org.eclipse.jdt.core_3.2.3.v_686_R32x.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream