geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1078719 - in /geronimo/bundles/trunk/axis: ./ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/axis/ src/main/java/org/apache/axis/components/ src/main/java/org/apache/axis/components/logger/
Date Mon, 07 Mar 2011 09:17:12 GMT
Author: rwonly
Date: Mon Mar  7 09:17:12 2011
New Revision: 1078719

URL: http://svn.apache.org/viewvc?rev=1078719&view=rev
Log:
GERONIMO-5850 org.apache.commons.discovery.DiscoveryException: Unable to instantiate implementation
class for org.apache.commons.logging.LogFactory (PAXLOGGING-58)

Added:
    geronimo/bundles/trunk/axis/src/main/java/
    geronimo/bundles/trunk/axis/src/main/java/org/
    geronimo/bundles/trunk/axis/src/main/java/org/apache/
    geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/
    geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/
    geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/
    geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/LogFactory.java
  (with props)
Modified:
    geronimo/bundles/trunk/axis/pom.xml

Modified: geronimo/bundles/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis/pom.xml?rev=1078719&r1=1078718&r2=1078719&view=diff
==============================================================================
--- geronimo/bundles/trunk/axis/pom.xml (original)
+++ geronimo/bundles/trunk/axis/pom.xml Mon Mar  7 09:17:12 2011
@@ -52,29 +52,13 @@
             <groupId>${pkgGroupId}</groupId>
             <artifactId>${pkgArtifactId}</artifactId>
             <version>${pkgVersion}</version>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>axis</groupId>
-                    <artifactId>axis-jaxrpc</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>axis</groupId>
-                    <artifactId>axis-saaj</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>axis</groupId>
-                    <artifactId>axis-wsdl4j</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-discovery</groupId>
-                    <artifactId>commons-discovery</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.0.4</version>
         </dependency>
     </dependencies>
 
@@ -86,18 +70,34 @@
                 <configuration>
                     <instructions>
                         <Export-Package>org.apache.axis*;version="1.4"</Export-Package>
-
                         <Import-Package>com.sun*;resolution:=optional,
                             sun*;resolution:=optional,
-			    javax.jms*;resolution:=optional,			    
+                            javax.jms*;resolution:=optional,			    
                             org.apache.bsf*;resolution:=optional,
                             org.apache.commons.httpclient*;resolution:=optional,
                             org.apache.commons.net*;resolution:=optional,
-                            *</Import-Package>
+                            *
+                        </Import-Package>
                         <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+                        <Embed-Dependency>*;scope=provided;inline=true</Embed-Dependency>
+                        <!-- the workaround for the issue pointed out in PAXLOGGING-58
-->
+                        <Include-Resource>
+                           {maven-resources},
+                           org/apache/axis/components/logger/LogFactory.class=target/classes/org/apache/axis/components/logger/LogFactory.class,
+                           org/apache/axis/components/logger/LogFactory$1.class=target/classes/org/apache/axis/components/logger/LogFactory$1.class
+                        </Include-Resource>
                     </instructions>
                 </configuration>
             </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.4</source>
+                    <target>1.4</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

Added: geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/LogFactory.java
URL: http://svn.apache.org/viewvc/geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/LogFactory.java?rev=1078719&view=auto
==============================================================================
--- geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/LogFactory.java
(added)
+++ geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/LogFactory.java
Mon Mar  7 09:17:12 2011
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.axis.components.logger;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+
+import org.apache.commons.logging.Log;
+
+
+/**
+ * @author Richard A. Sitze
+ */
+public class LogFactory {
+    /**
+     * Override group context..
+     */
+    private static final org.apache.commons.logging.LogFactory logFactory =
+        getLogFactory();
+
+    public static Log getLog(String name) {
+        return org.apache.commons.logging.LogFactory.getLog(name);
+    }
+    
+    private static final org.apache.commons.logging.LogFactory getLogFactory() {
+        return (org.apache.commons.logging.LogFactory)
+            AccessController.doPrivileged(
+                new PrivilegedAction() {
+                    public Object run() {
+                        return org.apache.commons.logging.LogFactory.getFactory();
+                    }
+                });
+    }
+}

Propchange: geronimo/bundles/trunk/axis/src/main/java/org/apache/axis/components/logger/LogFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message