geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r927832 - in /geronimo/server/trunk: framework/buildsupport/geronimo-osgi-plugin/src/main/resources/ plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/
Date Fri, 26 Mar 2010 13:06:29 GMT
Author: rickmcguire
Date: Fri Mar 26 13:06:28 2010
New Revision: 927832

URL: http://svn.apache.org/viewvc?rev=927832&view=rev
Log:
Fix build compile error, update the bundle verifier for bootstrap package changes

Modified:
    geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile?rev=927832&r1=927831&r2=927832&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
(original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-osgi-plugin/src/main/resources/Geronimo-1.6.profile
Fri Mar 26 13:06:28 2010
@@ -80,12 +80,6 @@ org.osgi.framework.system.packages = \
  javax.tools, \
  javax.transaction; javax.transaction.xa; version=1.1; partial=true; mandatory:=partial,
\
  javax.xml, \
- javax.xml.bind;version=2.1, \
- javax.xml.bind.annotation;version=2.1, \
- javax.xml.bind.annotation.adapters;version=2.1, \
- javax.xml.bind.attachment;version=2.1, \
- javax.xml.bind.helpers;version=2.1, \
- javax.xml.bind.util;version=2.1, \
  javax.xml.crypto, \
  javax.xml.crypto.dom, \
  javax.xml.crypto.dsig, \
@@ -93,24 +87,15 @@ org.osgi.framework.system.packages = \
  javax.xml.crypto.dsig.keyinfo, \
  javax.xml.crypto.dsig.spec, \
  javax.xml.datatype, \
- javax.xml.namespace, \
+ javax.xml.namespace;version=1.0, \
  javax.xml.parsers, \
  javax.xml.soap;version=1.3, \
- javax.xml.stream;version=1.0, \
- javax.xml.stream.events;version=1.0, \
- javax.xml.stream.util;version=1.0, \
  javax.xml.transform, \
  javax.xml.transform.dom, \
  javax.xml.transform.sax, \
  javax.xml.transform.stax, \
  javax.xml.transform.stream, \
  javax.xml.validation, \
- javax.xml.ws;version=2.2, \
- javax.xml.ws.handler;version=2.2, \
- javax.xml.ws.handler.soap;version=2.2, \
- javax.xml.ws.http;version=2.2, \
- javax.xml.ws.soap;version=2.2, \
- javax.xml.ws.spi;version=2.2, \
  javax.xml.xpath, \
  org.ietf.jgss, \
  org.omg.CORBA, \
@@ -159,7 +144,7 @@ org.osgi.framework.system.packages = \
 
 org.osgi.framework.system.packages.extra = \
  sun.misc
- 
+
 org.osgi.framework.bootdelegation = \
  javax.*,\
  org.ietf.jgss,\
@@ -168,7 +153,7 @@ org.osgi.framework.bootdelegation = \
  org.xml.*,\
  sun.*,\
  com.sun.*
- 
+
 org.osgi.framework.executionenvironment = \
  OSGi/Minimum-1.0,\
  OSGi/Minimum-1.1,\

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=927832&r1=927831&r2=927832&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
Fri Mar 26 13:06:28 2010
@@ -639,7 +639,7 @@ public class ConnectorModuleBuilder impl
                         outboundResourceAdapter = new OutboundResourceAdapter();
                         resourceAdapter.setOutboundResourceAdapter(outboundResourceAdapter);
                     }
-                    if (outboundResourceAdapter.isReauthenticationSupport() == null) {
+                    if (outboundResourceAdapter.isReauthenticationSupport()) {
                         outboundResourceAdapter.setReauthenticationSupport(ra.reauthenticationSupport());
                     }
                     if (outboundResourceAdapter.getTransactionSupport() == null) {



Mime
View raw message