cvs commit: incubator-geronimo/modules/system/xdocs - New directory
adc 2004/02/12 18:11:14 incubator-geronimo/modules/system/xdocs - New directory
cvs commit: incubator-geronimo/specs/schema maven.xml
adc 2004/02/12 20:22:37
Modified:specs/schema maven.xml
Log:
Updates to build site
Revision ChangesPath
1.8 +4 -4 incubator-geronimo/specs/schema/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/specs/schema/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 13 Feb 2004 04:17:37 - 1.7
+++ maven.xml 13 Feb 2004 04:22:37 - 1.8
@@ -17,7 +17,7 @@
cataloglocation=${basedir}/src/catalog/resolver-catalog.xml/
/preGoal
-goal name=maven-javadoc-plugin:report
-!-- no Java src per se, don't run javadoc --
-/goal
+postGoal name=xdoc:register-reports
+ attainGoal name=maven-javadoc-plugin:deregister/
+/postGoal
/project
cvs commit: incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/java ComponentContextBuilder.java
djencks 2004/02/12 21:48:40
Modified:modules/naming/src/java/org/apache/geronimo/naming/java
ComponentContextBuilder.java
Log:
marginal improvements
Revision ChangesPath
1.2 +18 -10
incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java
Index: ComponentContextBuilder.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentContextBuilder.java 12 Feb 2004 20:38:18 - 1.1
+++ ComponentContextBuilder.java 13 Feb 2004 05:48:40 - 1.2
@@ -66,6 +66,7 @@
import org.apache.geronimo.xbeans.j2ee.EjbRefType;
import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
+import org.apache.geronimo.xbeans.j2ee.EjbLinkType;
/**
*
@@ -74,13 +75,16 @@
*/
public class ComponentContextBuilder {
+private static final String ENV = env/;
+
private final ProxyFactory proxyFactory;
private final UserTransaction userTransaction;
-private static final String ENV = env/;
+private final ClassLoader cl;
-public ComponentContextBuilder(ProxyFactory proxyFactory,
UserTransaction userTransaction) {
+public ComponentContextBuilder(ProxyFactory proxyFactory,
UserTransaction userTransaction, ClassLoader cl) {
this.userTransaction = userTransaction;
this.proxyFactory = proxyFactory;
+this.cl = cl;
}
/**
@@ -153,7 +157,7 @@
String name = ejbRef.getEjbRefName().getStringValue();
Object proxy = null;
try {
-proxy =
proxyFactory.getProxy(loadClass(ejbRef.getHome().getStringValue())
,loadClass(ejbRef.getRemote().getStringValue()),
getLink(ejbRef.getEjbLink().getStringValue()));
+proxy =
proxyFactory.getProxy(loadClass(ejbRef.getHome().getStringValue()),
loadClass(ejbRef.getRemote().getStringValue()), getLink(ejbRef.getEjbLink()));
} catch (NamingException e) {
throw new DeploymentException(Could not construct proxy for
+ ejbRef + , + e.getMessage());
}
@@ -165,12 +169,16 @@
}
}
-private Object getLink(String link) {
+private Object getLink(EjbLinkType link) {
return null;
}
-private Class loadClass(String stringValue) {
-return null;
+private Class loadClass(String stringValue) throws DeploymentException {
+try {
+return cl.loadClass(stringValue);
+} catch (ClassNotFoundException e) {
+throw new DeploymentException(Could not load interface class:
+ stringValue, e);
+}
}
private void buildEJBLocalRefs(ReadOnlyContext readOnlyContext,
EjbLocalRefType[] ejbLocalRefs) throws DeploymentException {
@@ -179,7 +187,7 @@
String name = ejbLocalRef.getEjbRefName().getStringValue();
Object proxy = null;
try {
-proxy =
proxyFactory.getProxy(loadClass(ejbLocalRef.getLocalHome().getStringValue()),
loadClass(ejbLocalRef.getLocal().getStringValue()),
getLink(ejbLocalRef.toString()));
+proxy =
proxyFactory.getProxy(loadClass(ejbLocalRef.getLocalHome().getStringValue()),
loadClass(ejbLocalRef.getLocal().getStringValue()),
getLink(ejbLocalRef.getEjbLink()));
} catch (NamingException e) {
throw new DeploymentException(Could not construct reference
to + ejbLocalRef + , + e.getMessage());
}
@@ -199,13 +207,13 @@
Object ref;
if (java.net.URL.equals(type)) {
try {
-ref = new URL(null /*resRef.geturl().getStringValue()*/);
+ref = new URL(http://thisisnotaurlyousupplied;
/*resRef.geturl().getStringValue()*/);
} catch (MalformedURLException e) {
throw new DeploymentException(Invalid URL for
resource-ref +name, e);
}
} else {
try {
-ref =
proxyFactory.getProxy(loadClass(resRef.getResType().getStringValue()),
getLink(resRef.toString()));
+ref =
proxyFactory.getProxy(loadClass(resRef.getResType().getStringValue()), null);
} catch (NamingException e) {
throw new DeploymentException(Could not construct
reference to + resRef);
}
cvs commit: incubator-geronimo/assembly maven.xml
dain2004/02/12 23:12:56
Modified:assembly maven.xml
Log:
Log4j.properties files are no longer included in the startup jars
Revision ChangesPath
1.8 +2 -6 incubator-geronimo/assembly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 12 Feb 2004 21:15:51 - 1.7
+++ maven.xml 13 Feb 2004 07:12:56 - 1.8
@@ -94,8 +94,6 @@
!-- Create the server.jar file used to run the server--
ant:mkdir dir=target/bin/
ant:jar destfile=target/bin/server.jar
-!-- include the log4j.properties file from the kernel module --
-fileset file=../modules/kernel/src/conf/log4j.properties/
manifest
attribute name=Main-Class
value=org.apache.geronimo.Geronimo/
attribute name=Class-Path value=${server.classpath}/
@@ -104,8 +102,6 @@
!-- Create the deploy.jar file used to deploy things --
ant:jar destfile=target/bin/deploy.jar
-!-- include the log4j.properties file from the kernel module --
-fileset file=../modules/kernel/src/conf/log4j.properties/
manifest
attribute name=Main-Class
value=org.apache.geronimo.deployment.Deployer/
attribute name=Class-Path value=${deploy.classpath}/
@@ -155,7 +151,7 @@
deploy:deploy
deployconfigid=org/apache/geronimo/Server
deployoutfile=target/config/server.car
-
deployurl=${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar,${maven.repo.local}/concurrent/jars/concurrent-1.3.2.jar,${maven.repo.local}/xerces/jars/xercesImpl-2.6.0.jar,${maven.repo.local}/xml-apis/jars/xml-apis-1.0.b2.jar,${maven.repo.local}/xml-commons-resolver/jars/xml-commons-resolver-1.1.jar,${maven.repo.local}/geronimo/jars/geronimo-core-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-common-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/log4j-service-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/server-info-${pom.currentVersion}.jar/
+
deployurl=${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar,${maven.repo.local}/concurrent/jars/concurrent-1.3.2.jar,${maven.repo.local}/xerces/jars/xercesImpl-2.6.0.jar,${maven.repo.local}/xml-apis/jars/xml-apis-1.0.b2.jar,${maven.repo.local}/xml-commons-resolver/jars/xml-commons-resolver-1.1.jar,${maven.repo.local}/geronimo/jars/geronimo-core-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-common-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/loglog4j-service-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/server-info-${pom.currentVersion}.jar/
ant:echo message=did deploy:server/
--
/goal
cvs commit: incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/repository ReadOnlyRepository.java
dain2004/02/12 23:22:22
Modified:modules/deployment/src/java/org/apache/geronimo/deployment
Deployer.java
modules/kernel/src/java/org/apache/geronimo Geronimo.java
modules/kernel/src/java/org/apache/geronimo/kernel/log
GeronimoLogFactory.java
modules/system/src/java/org/apache/geronimo/system/repository
ReadOnlyRepository.java
Added: modules/kernel/src/java/org/apache/geronimo/kernel/log
BootstrapJdk14Log.java BootstrapLog4jLog.java
BootstrapLogFactory.java GeronimoLogging.java
Log:
Logging fixes
* Logging now uses a Bootstrap log factory which selects either the
geronimo BootstrapLog4jLog or BootstrapJdk14Log based on availability
of the log4j classes
* GeronimoLog now keeps instances and delegate log factory in a static
fields as commons-logging likes to create a factory per classloader
* Added GeronimoLogging, which is used to install our logging code
* Changed Geronimo.java and Deployer.java to use the new GeronimpLogging
initialization code
Revision ChangesPath
1.2 +3 -4
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java
Index: Deployer.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Deployer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Deployer.java 12 Feb 2004 18:27:39 - 1.1
+++ Deployer.java 13 Feb 2004 07:22:22 - 1.2
@@ -70,14 +70,13 @@
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
-import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoFactory;
import org.apache.geronimo.gbean.GConstructorInfo;
import org.apache.geronimo.gbean.GOperationInfo;
import org.apache.geronimo.gbean.GReferenceInfo;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.log.GeronimoLogFactory;
+import org.apache.geronimo.kernel.log.GeronimoLogging;
import org.apache.geronimo.kernel.config.LocalConfigStore;
import org.apache.xmlbeans.SchemaTypeLoader;
import org.apache.xmlbeans.XmlBeans;
@@ -92,7 +91,7 @@
public class Deployer {
static {
// This MUST be done before the first log is acquired
-System.setProperty(LogFactory.FACTORY_PROPERTY,
GeronimoLogFactory.class.getName());
+GeronimoLogging.initialize(GeronimoLogging.ERROR);
}
public static final URI DEFAULT_CONFIG =
URI.create(org/apache/geronimo/J2EEDeployer);
1.9 +3 -5
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/Geronimo.java
Index: Geronimo.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/Geronimo.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Geronimo.java 12 Feb 2004 18:23:58 - 1.8
+++ Geronimo.java 13 Feb 2004 07:22:22 - 1.9
@@ -63,10 +63,9 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.LocalConfigStore;
-import org.apache.geronimo.kernel.log.GeronimoLogFactory;
+import org.apache.geronimo.kernel.log.GeronimoLogging;
/**
* @version $Revision$ $Date$
@@ -74,7 +73,7 @@
public class Geronimo {
static {
// This MUST be done before the first log is acquired
-System.setProperty(LogFactory.FACTORY_PROPERTY,
GeronimoLogFactory.class.getName());
+GeronimoLogging.initialize(GeronimoLogging.INFO);
}
private Geronimo() {
@@ -112,7 +111,6 @@
}
configs.add(configID);
}
-
final Kernel kernel;
File storeDir = new File(storeDirName);
if (storeDir.exists()) {
1.2 +76 -39
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogFactory.java
Index: GeronimoLogFactory.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/log/GeronimoLogFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GeronimoLogFactory.java 11 Feb 2004 03:14:11 - 1.1
+++ GeronimoLogFactory.java 13 Feb 2004 07:22:22 - 1.2
@@ -59,81 +59,118 @@
import java.util.HashSet;
import
cvs commit: incubator-geronimo/modules/naming .cvsignore
jboynes 2004/02/12 23:27:09 Added: modules/naming .cvsignore Log: Ignore common files Revision ChangesPath 1.1 incubator-geronimo/modules/naming/.cvsignore Index: .cvsignore === .project .classpath maven.log junit*.properties target
cvs commit: incubator-geronimo/assembly maven.xml
jboynes 2004/02/13 07:46:47 Modified:assembly maven.xml Log: Indicate progress Revision ChangesPath 1.9 +4 -1 incubator-geronimo/assembly/maven.xml Index: maven.xml === RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- maven.xml 13 Feb 2004 07:12:56 - 1.8 +++ maven.xml 13 Feb 2004 15:46:47 - 1.9 @@ -109,6 +109,7 @@ /ant:jar !-- bootstrap the service deployer -- +ant:echoBootstrapping service deployer/ant:echo ant:mkdir dir=target/config/ ant:mkdir dir=target/config-store/ j:invokeStatic className=org.apache.geronimo.deployment.Bootstrap method=bootstrap @@ -118,6 +119,7 @@ /j:invokeStatic !-- build the system configuration -- +ant:echoBuilding system configuration/ant:echo ant:java fork=true jar=target/bin/deploy.jar ant:sysproperty key=geronimo.base.dir value=target/ ant:arg value=--install/ @@ -132,6 +134,7 @@ /ant:java !-- build the J2EEServer configuration -- +ant:echoBuilding server configuration/ant:echo ant:java fork=true jar=target/bin/deploy.jar ant:sysproperty key=geronimo.base.dir value=target/ ant:arg value=--install/
cvs commit: incubator-geronimo/assembly/src/plan debug-tool.xml
jboynes 2004/02/13 10:14:03 Added: assembly/src/plan debug-tool.xml Log: Hack to get make debug tool runnable Revision ChangesPath 1.1 incubator-geronimo/assembly/src/plan/debug-tool.xml Index: debug-tool.xml === ?xml version=1.0 encoding=UTF-8? !-- THIS FILE IS A SERIOUS HACK UNTIL THE WAR DEPLOYER IS AVAILABLE IT IS AN EXAMPLE OF HOW TO DO IT THE HARD WAY AND SHOULD NOT BE TAKEN AS REPRESENTATIVE OF HOW THIS SHOULD WORK -- configuration xmlns=http://geronimo.apache.org/xml/ns/deployment; configId=org/apache/geronimo/DebugConsole parentId=org/apache/geronimo/Server gbean name=geronimo.server:type=WebApp,container=Jetty,app=test class=org.apache.geronimo.jetty.JettyWebApplicationContext attribute name=URI type=java.net.URIfile:/D:/apache/incubator-geronimo/modules/console-web/target/geronimo-web-console//attribute attribute name=ContextPath type=java.lang.String/debug-tool/attribute reference name=JettyContainergeronimo.server:type=WebContainer,container=Jetty/reference /gbean /configuration
[Apache Geronimo Wiki] Updated: WikiSandBox
Date: 2004-02-13T14:36:46 Editor: 216.219.55.12 Wiki: Apache Geronimo Wiki Page: WikiSandBox URL: http://wiki.apache.org/geronimo/WikiSandBox no comment Change Log: -- @@ -1,5 +1,5 @@ Please feel free to experiment here, after the four dashes below... and please do '''NOT''' create new pages without any meaningful content just to try it out. - +Porbando wiki '''Tip:''' Shift-click HelpOnEditing to open a second window with the help pages.
cvs commit: incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/serverinfo ServerInfo.java
dain2004/02/13 15:21:39
Modified:modules/system/src/java/org/apache/geronimo/system/serverinfo
ServerInfo.java
Log:
Addded automatic detection of base directory.
Revision ChangesPath
1.2 +18 -3
incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java
Index: ServerInfo.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServerInfo.java 12 Feb 2004 18:12:52 - 1.1
+++ ServerInfo.java 13 Feb 2004 23:21:39 - 1.2
@@ -58,6 +58,8 @@
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.JarURLConnection;
+import java.net.URL;
import org.apache.geronimo.gbean.GAttributeInfo;
import org.apache.geronimo.gbean.GBeanInfo;
@@ -78,7 +80,7 @@
baseURI = null;
}
-public ServerInfo(String baseDirectory) {
+public ServerInfo(String baseDirectory) throws Exception {
// force load of server constants
ServerConstants.getVersion();
@@ -94,8 +96,21 @@
this.baseDirectory = baseDirectory;
} else {
// last chance - guess where the base directory shoul be
-throw new IllegalArgumentException(Could not find base
directory. Please use the -Dgeronimo.base.dir=your-directory command line
option.);
+URL url =
getClass().getClassLoader().getResource(META-INF/startup-jar);
+if(url != null) {
+try {
+JarURLConnection jarConnection = (JarURLConnection)
url.openConnection();
+URI uri = new
URI(jarConnection.getJarFileURL().toString()).resolve(..);
+this.baseDirectory = uri.getPath();
+} catch (Exception e) {
+// ignore exception is thrown below
+}
+}
}
+}
+
+if(this.baseDirectory == null) {
+throw new IllegalArgumentException(Could not find base
directory. Please use the -Dgeronimo.base.dir=your-directory command line
option.);
}
// now that we have the base directory, check that it is a valid
directory
cvs commit: incubator-geronimo/modules/naming/src/schema - New directory
djencks 2004/02/13 15:29:33 incubator-geronimo/modules/naming/src/schema - New directory
