[jboss-cvs] JBossAS SVN: r91795 - in branches/JBPAPP_5_0: component-matrix and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 29 20:03:38 EDT 2009
Author: fnasser at redhat.com
Date: 2009-07-29 20:03:38 -0400 (Wed, 29 Jul 2009)
New Revision: 91795
Removed:
branches/JBPAPP_5_0/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
Modified:
branches/JBPAPP_5_0/build/build-distr.xml
branches/JBPAPP_5_0/build/build.xml
branches/JBPAPP_5_0/component-matrix/pom.xml
branches/JBPAPP_5_0/iiop/.classpath
branches/JBPAPP_5_0/iiop/build.xml
branches/JBPAPP_5_0/iiop/pom.xml
branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/CorbaNamingService.java
branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java
branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java
branches/JBPAPP_5_0/thirdparty/pom.xml
Log:
JBPTP-116 - Upgrade JacORB to 2.3.1jboss-patch01
Modified: branches/JBPAPP_5_0/build/build-distr.xml
===================================================================
--- branches/JBPAPP_5_0/build/build-distr.xml 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/build/build-distr.xml 2009-07-30 00:03:38 UTC (rev 91795)
@@ -1383,9 +1383,6 @@
<fileset dir="${jacorb.jacorb.lib}">
<include name="jacorb.jar"/>
</fileset>
- <fileset dir="${apache.avalon.lib}">
- <include name="avalon-framework.jar"/>
- </fileset>
</copy>
<!-- Copy thirdparty client code -->
@@ -1393,9 +1390,6 @@
<fileset dir="${jacorb.jacorb.lib}">
<include name="jacorb.jar"/>
</fileset>
- <fileset dir="${apache.avalon.lib}">
- <include name="avalon-framework.jar"/>
- </fileset>
<fileset dir="${apache.avalon.logkit.lib}">
<include name="logkit.jar"/>
</fileset>
Modified: branches/JBPAPP_5_0/build/build.xml
===================================================================
--- branches/JBPAPP_5_0/build/build.xml 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/build/build.xml 2009-07-30 00:03:38 UTC (rev 91795)
@@ -775,7 +775,6 @@
-->
<move todir="${install.common.lib}">
<fileset dir="${install.all.lib}">
- <exclude name="avalon-framework.jar"/>
<exclude name="hibernate-jbosscache2.jar"/>
<exclude name="jacorb.jar"/>
<exclude name="jbosscache-core.jar"/>
@@ -926,7 +925,6 @@
<include name="conf/jacorb.properties"/>
<include name="deploy/juddi-service.sar/**"/>
<include name="deploy/iiop-service.xml"/>
- <include name="lib/avalon-framework.jar"/>
<include name="lib/jacorb.jar"/>
</fileset>
</copy>
Modified: branches/JBPAPP_5_0/component-matrix/pom.xml
===================================================================
--- branches/JBPAPP_5_0/component-matrix/pom.xml 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/component-matrix/pom.xml 2009-07-30 00:03:38 UTC (rev 91795)
@@ -31,7 +31,7 @@
<!-- Properties -->
<properties>
<version.apache.xalan>2.7.1.patch02</version.apache.xalan>
- <version.jacorb>2.3.0jboss.patch6-brew</version.jacorb>
+ <version.jacorb>2.3.1jboss.patch01</version.jacorb>
<version.javax.faces>1.2_12</version.javax.faces>
<version.jboss.jaxr>2.0.0</version.jboss.jaxr>
<version.jboss.jbossts>4.6.1.GA</version.jboss.jbossts>
@@ -166,12 +166,6 @@
</dependency>
<dependency>
- <groupId>apache-avalon</groupId>
- <artifactId>avalon-framework</artifactId>
- <version>4.1.5</version>
- </dependency>
-
- <dependency>
<groupId>apache-avalon-logkit</groupId>
<artifactId>logkit</artifactId>
<version>1.2</version>
Modified: branches/JBPAPP_5_0/iiop/.classpath
===================================================================
--- branches/JBPAPP_5_0/iiop/.classpath 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/.classpath 2009-07-30 00:03:38 UTC (rev 91795)
@@ -5,8 +5,7 @@
<classpathentry kind="src" path="output/gen-src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="lib" path="/thirdparty/jacorb/lib/jacorb.jar"/>
- <classpathentry exported="true" kind="lib" path="/thirdparty/apache-avalon/lib/avalon-framework.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-kernel-sources.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jboss/jboss-bootstrap/lib/jboss-bootstrap.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jbossts/lib/jbossjts-jacorb.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: branches/JBPAPP_5_0/iiop/build.xml
===================================================================
--- branches/JBPAPP_5_0/iiop/build.xml 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/build.xml 2009-07-30 00:03:38 UTC (rev 91795)
@@ -74,7 +74,6 @@
&libraries;
<!-- The combined library classpath -->
<path id="library.classpath">
- <path refid="apache.avalon.classpath"/>
<path refid="apache.log4j.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
Modified: branches/JBPAPP_5_0/iiop/pom.xml
===================================================================
--- branches/JBPAPP_5_0/iiop/pom.xml 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/pom.xml 2009-07-30 00:03:38 UTC (rev 91795)
@@ -97,11 +97,6 @@
<dependencies>
<!-- Compile (global dependencies) -->
<dependency>
- <groupId>apache-avalon</groupId>
- <artifactId>avalon-framework</artifactId>
- </dependency>
-
- <dependency>
<groupId>apache-xerces</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
Modified: branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/CorbaNamingService.java
===================================================================
--- branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/CorbaNamingService.java 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/CorbaNamingService.java 2009-07-30 00:03:38 UTC (rev 91795)
@@ -22,6 +22,7 @@
package org.jboss.iiop;
import java.util.Hashtable;
+
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.Name;
@@ -29,7 +30,7 @@
import javax.naming.Reference;
import javax.naming.spi.ObjectFactory;
-import org.apache.avalon.framework.configuration.Configuration;
+import org.jacorb.config.Configuration;
import org.jboss.logging.Logger;
import org.jboss.system.ServiceMBeanSupport;
import org.omg.CORBA.ORB;
@@ -42,8 +43,8 @@
import org.omg.CosNaming.NameComponent;
import org.omg.CosNaming.NamingContext;
import org.omg.CosNaming.NamingContextExt;
+import org.omg.CosNaming.NamingContextExtHelper;
import org.omg.CosNaming.NamingContextHelper;
-import org.omg.CosNaming.NamingContextExtHelper;
import org.omg.PortableServer.IdAssignmentPolicyValue;
import org.omg.PortableServer.LifespanPolicyValue;
import org.omg.PortableServer.POA;
Modified: branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java
===================================================================
--- branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLServerSocketFactory.java 2009-07-30 00:03:38 UTC (rev 91795)
@@ -24,8 +24,12 @@
import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
+
import javax.net.ssl.SSLServerSocket;
+import org.jacorb.config.Configurable;
+import org.jacorb.config.Configuration;
+import org.jacorb.config.ConfigurationException;
import org.jboss.iiop.CorbaORBService;
import org.jboss.logging.Logger;
import org.jboss.security.SecurityDomain;
@@ -43,30 +47,28 @@
* @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
* @version $Revision$
*/
-public class SSLServerSocketFactory
- implements org.jacorb.orb.factory.ServerSocketFactory,
- org.apache.avalon.framework.configuration.Configurable
+public class SSLServerSocketFactory implements org.jacorb.orb.factory.ServerSocketFactory, Configurable
{
// Static --------------------------------------------------------
-
+
private static Logger log = Logger.getLogger(SSLServerSocketFactory.class);
-
+
// Attributes ----------------------------------------------------
-
+
private DomainServerSocketFactory domainFactory = null;
+
private boolean require_mutual_auth = false;
+
private boolean request_mutual_auth = false;
-
+
// Constructor ---------------------------------------------------
-
- public SSLServerSocketFactory(org.jacorb.orb.ORB orb)
- throws IOException
+
+ public SSLServerSocketFactory(org.jacorb.orb.ORB orb) throws IOException
{
log.info("Creating");
-
- SecurityDomain securityDomain =
- (SecurityDomain)Registry.lookup(CorbaORBService.SSL_DOMAIN);
+ SecurityDomain securityDomain = (SecurityDomain) Registry.lookup(CorbaORBService.SSL_DOMAIN);
+
try
{
domainFactory = new DomainServerSocketFactory(securityDomain);
@@ -78,16 +80,11 @@
throw e;
}
- short serverSupportedOptions = Short.parseShort(
- orb.getConfiguration().getAttribute(
- "jacorb.security.ssl.server.supported_options","20"),
- 16); // 16 is the base as we take the string value as hex!
- short serverRequiredOptions = Short.parseShort(
- orb.getConfiguration().getAttribute(
- "jacorb.security.ssl.server.required_options","0"),
- 16); // 16 is the base as we take the string value as hex!
+ short serverSupportedOptions = Short.parseShort(orb.getConfiguration().getAttribute(
+ "jacorb.security.ssl.server.supported_options", "20"), 16); // 16 is the base as we take the string value as hex!
+ short serverRequiredOptions = Short.parseShort(orb.getConfiguration().getAttribute(
+ "jacorb.security.ssl.server.required_options", "0"), 16); // 16 is the base as we take the string value as hex!
-
if ((serverSupportedOptions & 0x40) != 0)
{
// would prefer to establish trust in client. If client can support
@@ -107,65 +104,49 @@
log.info("Will create SSL sockets that require client authentication");
log.info("Created");
}
-
+
// JacORB ServerSocketFactory implementation ------------------
// (interface org.jacorb.orb.factory.ServerSocketFactory)
- public ServerSocket createServerSocket(int port)
- throws IOException
+ public ServerSocket createServerSocket(int port) throws IOException
{
- SSLServerSocket s =
- (SSLServerSocket)domainFactory.createServerSocket(port);
+ SSLServerSocket s = (SSLServerSocket) domainFactory.createServerSocket(port);
- if (request_mutual_auth)
+ if (request_mutual_auth)
s.setWantClientAuth(request_mutual_auth);
- else if (require_mutual_auth)
+ else if (require_mutual_auth)
s.setNeedClientAuth(require_mutual_auth);
return s;
}
-
- public ServerSocket createServerSocket(int port, int backlog)
- throws IOException
+
+ public ServerSocket createServerSocket(int port, int backlog) throws IOException
{
- SSLServerSocket s =
- (SSLServerSocket)domainFactory.createServerSocket(port, backlog);
+ SSLServerSocket s = (SSLServerSocket) domainFactory.createServerSocket(port, backlog);
- if (request_mutual_auth)
+ if (request_mutual_auth)
s.setWantClientAuth(request_mutual_auth);
- else if (require_mutual_auth)
+ else if (require_mutual_auth)
s.setNeedClientAuth(require_mutual_auth);
return s;
}
- public ServerSocket createServerSocket(int port,
- int backlog,
- InetAddress ifAddress)
- throws IOException
+ public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException
{
- SSLServerSocket s =
- (SSLServerSocket)domainFactory.createServerSocket(port,
- backlog, ifAddress);
+ SSLServerSocket s = (SSLServerSocket) domainFactory.createServerSocket(port, backlog, ifAddress);
- if (request_mutual_auth)
+ if (request_mutual_auth)
s.setWantClientAuth(request_mutual_auth);
- else if (require_mutual_auth)
+ else if (require_mutual_auth)
s.setNeedClientAuth(require_mutual_auth);
return s;
}
-
- public void switchToClientMode(java.net.Socket socket)
- {
- // no-op
- }
// Avalon Configurable implementation ----------------------------
-
- public void configure(
- org.apache.avalon.framework.configuration.Configuration configuration)
- throws org.apache.avalon.framework.configuration.ConfigurationException
+
+ public void configure(Configuration configuration) throws ConfigurationException
{
// no-op
}
Modified: branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java
===================================================================
--- branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/src/main/org/jboss/iiop/jacorb/SSLSocketFactory.java 2009-07-30 00:03:38 UTC (rev 91795)
@@ -24,8 +24,12 @@
import java.io.IOException;
import java.net.Socket;
import java.net.UnknownHostException;
+
import javax.net.ssl.SSLSocket;
+import org.jacorb.config.Configurable;
+import org.jacorb.config.Configuration;
+import org.jacorb.config.ConfigurationException;
import org.jboss.iiop.CorbaORBService;
import org.jboss.logging.Logger;
import org.jboss.security.SecurityDomain;
@@ -43,10 +47,8 @@
* @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
* @version $Revision$
*/
-public class SSLSocketFactory
- implements org.jacorb.orb.factory.SocketFactory,
- org.apache.avalon.framework.configuration.Configurable
-{
+public class SSLSocketFactory implements org.jacorb.orb.factory.SocketFactory, Configurable
+{
// Static --------------------------------------------------------
private static Logger log = Logger.getLogger(SSLSocketFactory.class);
@@ -54,16 +56,14 @@
// Attributes ----------------------------------------------------
private DomainSocketFactory domainFactory = null;
-
+
// Constructor ---------------------------------------------------
- public SSLSocketFactory(org.jacorb.orb.ORB orb)
- throws IOException
+ public SSLSocketFactory(org.jacorb.orb.ORB orb) throws IOException
{
log.info("Creating");
- SecurityDomain securityDomain =
- (SecurityDomain)Registry.lookup(CorbaORBService.SSL_DOMAIN);
+ SecurityDomain securityDomain = (SecurityDomain) Registry.lookup(CorbaORBService.SSL_DOMAIN);
try
{
@@ -76,49 +76,45 @@
throw e;
}
}
-
+
// JacORB SSLSocketFactory implementation ------------------------
// (interface org.jacorb.orb.factory.SSLSocketFactory)
- /**
- * create a connected stream Socket.
- *
- * @param host the host name
- * @param port the port number
- * @return a connected stream Socket
- * @throws IOException, UnknownHostException
- */
- public Socket createSocket(String host, int port)
- throws IOException, UnknownHostException
- {
+ /**
+ * create a connected stream Socket.
+ *
+ * @param host the host name
+ * @param port the port number
+ * @return a connected stream Socket
+ * @throws IOException, UnknownHostException
+ */
+ public Socket createSocket(String host, int port) throws IOException, UnknownHostException
+ {
return domainFactory.createSocket(host, port);
}
-
- /**
- * create a connected stream Socket.
- *
- * @param host the host name
- * @param port the port number
- * @param timeout the timeout value to be used in milliseconds
- * @return a connected stream Socket
- * @throws IOException
- */
- public Socket createSocket(String host, int port, int timeout)
- throws IOException, UnknownHostException
+
+ /**
+ * create a connected stream Socket.
+ *
+ * @param host the host name
+ * @param port the port number
+ * @param timeout the timeout value to be used in milliseconds
+ * @return a connected stream Socket
+ * @throws IOException
+ */
+ public Socket createSocket(String host, int port, int timeout) throws IOException, UnknownHostException
{
return domainFactory.createSocket(host, port, timeout);
}
- public boolean isSSL (java.net.Socket s)
- {
- return (s instanceof SSLSocket);
+ public boolean isSSL(java.net.Socket s)
+ {
+ return (s instanceof SSLSocket);
}
-
+
// Avalon Configurable implementation ----------------------------
-
- public void configure(
- org.apache.avalon.framework.configuration.Configuration configuration)
- throws org.apache.avalon.framework.configuration.ConfigurationException
+
+ public void configure(Configuration configuration) throws ConfigurationException
{
// no-op
}
Deleted: branches/JBPAPP_5_0/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java
===================================================================
--- branches/JBPAPP_5_0/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/iiop/src/main/org/jboss/util/Log4jLoggerFactory.java 2009-07-30 00:03:38 UTC (rev 91795)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.util;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.logger.Logger;
-import org.apache.avalon.framework.logger.Log4JLogger;
-import org.jacorb.config.LoggerFactory;
-import org.jboss.logging.log4j.Log4jLoggerPlugin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * JacORB logger factory that creates named Avalon loggers with log4j
- * as the underlying log mechanism.
- *
- * @author <a href="mailto:reverbel at ime.usp.br">Francisco Reverbel</a>
- * @version $Revision$
- */
-public class Log4jLoggerFactory
- implements LoggerFactory
-{
- /** logging back-end mechanism used by all Log4jLoggerFactory instances */
- private final static String name = "log4j";
-
- /** cache of created loggers */
- private final Map namedLoggers = new HashMap();
-
- // Auxiliary static methods --------------------------------------
-
- /**
- * Gets a log4j logger by name.
- *
- * @param name the name of the logger
- * @return an <code>org.apache.log4j.Logger</code> instance
- */
- private static org.apache.log4j.Logger getLog4jLogger(String name)
- {
- org.jboss.logging.Logger l = org.jboss.logging.Logger.getLogger(name);
- org.jboss.logging.LoggerPlugin lp = l.getLoggerPlugin();
- if (lp instanceof Log4jLoggerPlugin)
- return ((Log4jLoggerPlugin)lp).getLogger();
- else
- {
- return null;
- }
- }
-
-
- // Implementation of org.apache.avalon.framework.configuration.Configuration
-
- public void configure(Configuration configuration)
- throws ConfigurationException
- {
- }
-
- // Implementation of org.jacorb.util.LoggerFactory ---------------
-
- /**
- * Gets the name of the logging back-end mechanism.
- *
- * @return the string <code>"log4j"</code>
- */
- public final String getLoggingBackendName()
- {
- return name;
- }
-
- /**
- * Gets an Avalon logger by name.
- *
- * @param name the name of the logger
- * @return an <code>org.apache.avalon.framework.logger.Logger</code>
- * instance
- */
- public Logger getNamedLogger(String name)
- {
- Object o = namedLoggers.get(name);
-
- if (o != null)
- return (Logger)o;
-
- org.apache.log4j.Logger log4jLogger = getLog4jLogger(name);
- Logger logger = new Log4JLogger(log4jLogger);
-
- namedLoggers.put(name, logger);
- return logger;
- }
-
- /**
- * Gets an Avalon root logger by name.
- *
- * @param name the name of the logger
- * @return an <code>org.apache.avalon.framework.logger.Logger</code>
- * instance
- */
- public Logger getNamedRootLogger(String name)
- {
- return getNamedLogger(name);
- }
-
- /**
- * Creates a named Avalon logger with given <code>logFileName</code>
- * and <code>maxLogSize</code> parameters. This is a dummy implementation
- * that always return null.
- *
- * @param name the name of the logger
- * @param logFileName the name of the file to log to
- * @param maxLogSize maximum size of the log file.
- *
- * @return the new logger (null in this implementation).
- */
- public Logger getNamedLogger(String name,
- String logFileName, long maxLogSize)
- throws java.io.IOException
- {
- return null;
- }
-
- /**
- * set the file name and max file size for logging to a file
- */
- public void setDefaultLogFile(String fileName, long maxLogSize)
- throws java.io.IOException
- {
- // not implemented
- }
-
-}
Modified: branches/JBPAPP_5_0/thirdparty/pom.xml
===================================================================
--- branches/JBPAPP_5_0/thirdparty/pom.xml 2009-07-29 23:54:42 UTC (rev 91794)
+++ branches/JBPAPP_5_0/thirdparty/pom.xml 2009-07-30 00:03:38 UTC (rev 91795)
@@ -990,10 +990,6 @@
<artifactId>antlr</artifactId>
</dependency>
<dependency>
- <groupId>apache-avalon</groupId>
- <artifactId>avalon-framework</artifactId>
- </dependency>
- <dependency>
<groupId>apache-avalon-logkit</groupId>
<artifactId>logkit</artifactId>
</dependency>
More information about the jboss-cvs-commits
mailing list