Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[287] trunk/sandbox/lsf-adapter-demo/WebConfig
|
From: <pka...@us...> - 2009-07-01 11:36:12
|
Revision: 287
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=287&view=rev
Author: pkasprzak
Date: 2009-07-01 11:35:51 +0000 (Wed, 01 Jul 2009)
Log Message:
-----------
* Remove dependency on Log4j (use standard glassfish logging)
* Cleanup
Modified Paths:
--------------
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/build-impl.xml
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/genfiles.properties
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.properties
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.xml
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/src/java/de/campussource/cse/webconfig/ConfigurationManagerImpl.java
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/build-impl.xml
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/genfiles.properties
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.properties
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.xml
trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/src/java/de/campussource/cse/webconfig/AuthServletStub.java
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/build-impl.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/build-impl.xml 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/build-impl.xml 2009-07-01 11:35:51 UTC (rev 287)
@@ -298,14 +298,12 @@
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="compile" name="library-inclusion-in-archive">
- <copyfiles files="${libs.Log4j.classpath}" todir="${build.classes.dir}"/>
<copyfiles files="${libs.hibernate-persistence.classpath}" todir="${build.classes.dir}"/>
</target>
<target depends="compile" name="library-inclusion-in-manifest">
- <copyfiles files="${libs.Log4j.classpath}" manifestproperty="manifest.libs.Log4j.classpath" todir="${dist.ear.dir}"/>
<copyfiles files="${libs.hibernate-persistence.classpath}" manifestproperty="manifest.libs.hibernate-persistence.classpath" todir="${dist.ear.dir}"/>
<manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
- <attribute name="Class-Path" value="${manifest.libs.Log4j.classpath} ${manifest.libs.hibernate-persistence.classpath} "/>
+ <attribute name="Class-Path" value="${manifest.libs.hibernate-persistence.classpath} "/>
</manifest>
</target>
<target name="-copy-meta-inf">
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/genfiles.properties
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/genfiles.properties 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/genfiles.properties 2009-07-01 11:35:51 UTC (rev 287)
@@ -1,9 +1,9 @@
-build.xml.data.CRC32=fcac7bb5
+build.xml.data.CRC32=1d5d0162
build.xml.script.CRC32=af89c22e
build.xml.stylesheet.CRC32=e5f4c432
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=fcac7bb5
-nbproject/build-impl.xml.script.CRC32=69e2ec3a
+nbproject/build-impl.xml.data.CRC32=1d5d0162
+nbproject/build-impl.xml.script.CRC32=5e2df2d9
nbproject/build-impl.xml.stylesheet.CRC32=36c39d59
nbproject/jaxws-build.xml.stylesheet.CRC32=f49c6152
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.properties
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.properties 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.properties 2009-07-01 11:35:51 UTC (rev 287)
@@ -20,7 +20,6 @@
jar.compress=false
jar.name=WebConfig-ejb.jar
javac.classpath=\
- ${libs.Log4j.classpath}:\
${libs.hibernate-persistence.classpath}
javac.debug=true
javac.deprecation=false
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.xml 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/nbproject/project.xml 2009-07-01 11:35:51 UTC (rev 287)
@@ -8,7 +8,6 @@
<data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
<name>WebConfig-ejb</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
- <included-library>libs.Log4j.classpath</included-library>
<included-library>libs.hibernate-persistence.classpath</included-library>
<source-roots>
<root id="src.dir" name="Source Packages"/>
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/src/java/de/campussource/cse/webconfig/ConfigurationManagerImpl.java
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/src/java/de/campussource/cse/webconfig/ConfigurationManagerImpl.java 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-ejb/src/java/de/campussource/cse/webconfig/ConfigurationManagerImpl.java 2009-07-01 11:35:51 UTC (rev 287)
@@ -1,12 +1,5 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
package de.campussource.cse.webconfig;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -14,15 +7,12 @@
import java.util.List;
import java.util.logging.*;
import java.util.Map;
-import javax.annotation.PostConstruct;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Unmarshaller;
-//import org.apache.log4j.Logger;
-
/**
*
* @author pete
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/build-impl.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/build-impl.xml 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/build-impl.xml 2009-07-01 11:35:51 UTC (rev 287)
@@ -505,15 +505,13 @@
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
<copyfiles files="${reference.WebConfig-ejb.dist}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.reference.WebConfig-ejb.dist" todir="${dist.ear.dir}"/>
- <copyfiles files="${libs.Log4j.classpath}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.libs.Log4j.classpath" todir="${dist.ear.dir}"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
- <attribute name="Class-Path" value="${manifest.reference.WebConfig-ejb.dist} ${manifest.libs.Log4j.classpath} "/>
+ <attribute name="Class-Path" value="${manifest.reference.WebConfig-ejb.dist} "/>
</manifest>
</target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
<copyfiles files="${reference.WebConfig-ejb.dist}" todir="${build.web.dir}/WEB-INF/lib"/>
- <copyfiles files="${libs.Log4j.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
<dirname file="${dist.ear.war}" property="dist.jar.dir"/>
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/genfiles.properties
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/genfiles.properties 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/genfiles.properties 2009-07-01 11:35:51 UTC (rev 287)
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=a3b7b4f2
+build.xml.data.CRC32=c214dfe1
build.xml.script.CRC32=e5b6ef86
build.xml.stylesheet.CRC32=c0ebde35
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=a3b7b4f2
-nbproject/build-impl.xml.script.CRC32=96d66a8f
+nbproject/build-impl.xml.data.CRC32=c214dfe1
+nbproject/build-impl.xml.script.CRC32=beda6148
nbproject/build-impl.xml.stylesheet.CRC32=174458fc
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.properties
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.properties 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.properties 2009-07-01 11:35:51 UTC (rev 287)
@@ -24,8 +24,7 @@
j2ee.server.type=J2EE
jar.compress=false
javac.classpath=\
- ${reference.WebConfig-ejb.dist}:\
- ${libs.Log4j.classpath}
+ ${reference.WebConfig-ejb.dist}
# Space-separated list of extra javac options
javac.compilerargs=
javac.debug=true
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.xml 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/nbproject/project.xml 2009-07-01 11:35:51 UTC (rev 287)
@@ -10,10 +10,6 @@
<file>${reference.WebConfig-ejb.dist}</file>
<path-in-war>WEB-INF/lib</path-in-war>
</library>
- <library>
- <file>${libs.Log4j.classpath}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
- </library>
</web-module-libraries>
<web-module-additional-libraries/>
<source-roots>
Modified: trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/src/java/de/campussource/cse/webconfig/AuthServletStub.java
===================================================================
--- trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/src/java/de/campussource/cse/webconfig/AuthServletStub.java 2009-07-01 11:34:36 UTC (rev 286)
+++ trunk/sandbox/lsf-adapter-demo/WebConfig/WebConfig-war/src/java/de/campussource/cse/webconfig/AuthServletStub.java 2009-07-01 11:35:51 UTC (rev 287)
@@ -4,12 +4,10 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import java.util.logging.*;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
-
-
/**
* provides a multi-level login mechanism and some basic HTML Design methods
* the login mechanism is currently unused
@@ -67,7 +65,7 @@
InitialContext ctx = new InitialContext();
configManager = (ConfigurationManager) ctx.lookup("cse/ConfigurationManager");
- logger = Logger.getLogger(AuthServletStub.class);
+ logger = Logger.getLogger("de.campussource.cse.webconfig.AuthServletStub");
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
