cvs commit: incubator-geronimo/specs/j2ee .cvsignore LICENSE.txt maven.xml project.xml
dain2004/02/11 19:17:54
Added: specs/j2ee .cvsignore LICENSE.txt maven.xml project.xml
Log:
New module to aggregate the specs into a single jar.
Revision ChangesPath
1.1 incubator-geronimo/specs/j2ee/.cvsignore
Index: .cvsignore
===
.project
.classpath
maven.log
junit*.properties
target
1.3 +0 -0 incubator-geronimo/specs/j2ee/LICENSE.txt
1.1 incubator-geronimo/specs/j2ee/maven.xml
Index: maven.xml
===
?xml version=1.0 encoding=ISO-8859-1?
!-- $Revision: 1.1 $ $Date: 2004/02/12 03:17:54 $ --
project default=default
xmlns:j=jelly:core
xmlns:ant=jelly:ant
goal name=jar prereqs=jar:jar/
goal name=jar:jar
ant:available property=jarExsts
file=${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar/
j:if test=${jarExsts}
j:forEach var=artifact items=${pom.artifacts}
uptodate property=rebuildJar
srcfile=${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar
targetfile=${artifact.path}/
j:if test=${rebuildJar}
j:break/
/j:if
/j:forEach
/j:if
j:if test=${!jarExsts || rebuildJar}
ant:mkdir dir=${basedir}/target/
ant:delete
file=${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar/
ant:jar
destfile=${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar
ant:metainf dir=${basedir}
ant:include name=LICENSE.txt/
/ant:metainf
j:forEach var=artifact items=${pom.artifacts}
zipfileset src=${artifact.path}
excludes=META-INF/LICENSE.txt/
/j:forEach
/ant:jar
/j:if
/goal
goal name=jar:install prereqs=jar:jar
ant:property name=jardir__
value=${maven.repo.local}/${pom.artifactDirectory}/jars/
ant:mkdir dir=${jardir__}/
ant:copy
file=${basedir}/target/${pom.artifactId}-${pom.currentVersion}.jar
todir=${jardir__}
overwrite=false
/
/goal
goal name=test:test/
!-- = --
!-- Global Properties --
!-- = --
!-- Determine what the top-level project root is --
j:set var=project.root
value=${pom.parentBasedir().getParentFile().getCanonicalFile()}/
!-- Load the global properties --
ant:property file=${project.root}/etc/global.properties/
!-- --
!-- Default Global Goals --
!-- --
goal name=default
attainGoal name=jar:install/
/goal
goal name=build
attainGoal name=default/
/goal
goal name=rebuild
attainGoal name=clean/
attainGoal name=build/
/goal
!-- Remove the log files --
goal name=clobber
description=Removes all (non-repository installed) build generated
files
!-- Let clean:clean do some work first --
attainGoal name=clean:clean/
j:jelly xmlns=jelly:ant
delete quiet=false failonerror=false
fileset dir=${basedir}
include name=maven.log/
include name=velocity.log*/
include name=junit*.properties/
/fileset
/delete
/j:jelly
/goal
goal name=clover.wrapper
!-- no src/test, don't run clover --
!--attainGoal name=clover/--
/goal
/project
1.3 +95 -14incubator-geronimo/specs/j2ee/project.xml
cvs commit: incubator-geronimo/modules/connector/src/etc/META-INF geronimo-service.xml
dain2004/02/11 21:43:57 Modified:modules/connector/src/etc/META-INF geronimo-service.xml Log: Commented out the ConnectorDeployer as it seem to no longer exist Revision ChangesPath 1.4 +3 -3 incubator-geronimo/modules/connector/src/etc/META-INF/geronimo-service.xml Index: geronimo-service.xml === RCS file: /home/cvs/incubator-geronimo/modules/connector/src/etc/META-INF/geronimo-service.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- geronimo-service.xml 2 Feb 2004 22:08:28 - 1.3 +++ geronimo-service.xml 12 Feb 2004 05:43:57 - 1.4 @@ -44,12 +44,12 @@ patterngeronimo.boot:role=Kernel/pattern /endpoint /gbean-- - +!-- gbean class=org.apache.geronimo.connector.deployment.ConnectorDeployer objectName=geronimo.deployment:type=connector default attribute=ConnectionTrackerNamePattern type=javax.management.ObjectNamegeronimo.connector:service=ConnectionTrackingCoordinator/default endpoint name=ParserFactory patterngeronimo.system:type=ParserFactory/pattern /endpoint /gbean - -/gbeans \ No newline at end of file +-- +/gbeans
cvs commit: incubator-geronimo/modules/security/src/schema geronimo-security.xsd xmlconfig.xml
djencks 2004/02/12 00:14:05
Modified:modules/security maven.xml project.xml
modules/security/src/java/org/apache/geronimo/security/jacc
EJBModuleConfiguration.java
WebModuleConfiguration.java
modules/security/src/java/org/apache/geronimo/security/util
ConfigurationUtil.java
modules/security/src/test/org/apache/geronimo/security
EjbModuleConfigurationTest.java LoginSQLTest.java
SecurityServiceTest.java
WebModuleConfigurationTest.java
Added: modules/security/src/test-data/xml/deployment
geronimo-security.xml
modules/security/src/schema geronimo-security.xsd
xmlconfig.xml
Log:
move to xmlbeans. The test xml docs need work.
Revision ChangesPath
1.2 +28 -20incubator-geronimo/modules/security/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/modules/security/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 23 Jan 2004 06:47:06 - 1.1
+++ maven.xml 12 Feb 2004 08:14:05 - 1.2
@@ -3,25 +3,33 @@
!-- $Revision$ $Date$ --
project default=default
- xmlns:j=jelly:core
- xmlns:ant=jelly:ant
- xmlns:maven=jelly:maven
- xmlns:xdoclet=common:xdoclet
- xmlns:castor=common:castor
+xmlns:j=jelly:core
+xmlns:ant=jelly:ant
+xmlns:maven=jelly:maven
+xmlns:xmlbeans=geronimo:xmlbeans
- preGoal name=xdoc:jelly-transform
-attainGoal name=html2xdoc/
- /preGoal
+preGoal name=xdoc:jelly-transform
+attainGoal name=html2xdoc/
+/preGoal
- !-- Set up the test files --
- postGoal name=test:test-resources
+preGoal name=java:compile
+xmlbeans:schema2java
+sourcedir=${basedir}/src
+sourceschema=schema/geronimo-security.xsd
+xmlconfigs=${basedir}/src/schema/xmlconfig.xml
+targetdir=${basedir}/target/xmlbeans
+
cataloglocation=${basedir}/../../specs/schema/src/catalog/resolver-catalog.xml/
+/preGoal
-j:jelly xmlns=jelly:ant
- !-- Create the directory where the test databases will reside --
- delete dir=${maven.build.dir}/database/
- mkdir dir=${maven.build.dir}/database/
-/j:jelly
+!-- Set up the test files --
+postGoal name=test:test-resources
- /postGoal
+j:jelly xmlns=jelly:ant
+!-- Create the directory where the test databases will reside
--
+delete dir=${maven.build.dir}/database/
+mkdir dir=${maven.build.dir}/database/
+/j:jelly
+
+/postGoal
/project
1.4 +19 -1 incubator-geronimo/modules/security/project.xml
Index: project.xml
===
RCS file: /home/cvs/incubator-geronimo/modules/security/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 25 Jan 2004 17:55:35 - 1.3
+++ project.xml 12 Feb 2004 08:14:05 - 1.4
@@ -27,6 +27,15 @@
dependencies
+!-- needed for xmlbeans runtime--
+dependency
+groupIdxmlbeans/groupId
+artifactIdxbean-apache/artifactId
+version1.0-DEV/version
+properties
+/properties
+/dependency
+
dependency
groupIdgeronimo/groupId
artifactIdgeronimo-core/artifactId
@@ -76,6 +85,15 @@
dependency
groupIdgeronimo-spec/groupId
artifactIdgeronimo-spec-servlet/artifactId
+versionDEV/version
+properties
+runtimetrue/runtime
+/properties
+/dependency
+
+dependency
+groupIdgeronimo-spec/groupId
+artifactIdgeronimo-spec-j2eeschema/artifactId
versionDEV/version
properties
runtimetrue/runtime
1.2 +26 -24
incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java
Index: EJBModuleConfiguration.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/security/src/java/org/apache/geronimo/security/jacc/EJBModuleConfiguration.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBModuleConfiguration.java 23 Jan 2004 06:47:07 - 1.1
+++ EJBModuleConfiguration.java 12 Feb 2004 08:14:05 - 1.2
@@ -61,14 +61,6 @@
import
cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/jmx JMXReferenceFactory.java
djencks 2004/02/12 00:18:21
Modified:modules/core project.xml
modules/core/src/java/org/apache/geronimo/naming/java
ComponentContextBuilder.java ReferenceFactory.java
modules/core/src/java/org/apache/geronimo/naming/jmx
JMXReferenceFactory.java
Log:
move jndi towards xmlbeans. most of jndi is disabled at the moment waiting
for geronimo jndi schema.
Revision ChangesPath
1.43 +19 -1 incubator-geronimo/modules/core/project.xml
Index: project.xml
===
RCS file: /home/cvs/incubator-geronimo/modules/core/project.xml,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- project.xml 11 Feb 2004 03:14:10 - 1.42
+++ project.xml 12 Feb 2004 08:18:21 - 1.43
@@ -26,6 +26,16 @@
dependencies
+!-- needed for xmlbeans runtime--
+dependency
+groupIdxmlbeans/groupId
+artifactIdxbean-apache/artifactId
+version1.0-DEV/version
+properties
+/properties
+/dependency
+
+
dependency
idcommons-logging/id
version1.0.3/version
@@ -61,6 +71,14 @@
versionDEV/version
properties
moduletrue/module
+/properties
+/dependency
+
+dependency
+groupIdgeronimo-spec/groupId
+artifactIdgeronimo-spec-j2eeschema/artifactId
+versionDEV/version
+properties
/properties
/dependency
1.13 +31 -33
incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java
Index: ComponentContextBuilder.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/naming/java/ComponentContextBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ComponentContextBuilder.java 22 Jan 2004 08:10:26 - 1.12
+++ ComponentContextBuilder.java 12 Feb 2004 08:18:21 - 1.13
@@ -62,12 +62,11 @@
import javax.naming.Reference;
import javax.transaction.UserTransaction;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbLocalRef;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.EjbRef;
-import
org.apache.geronimo.deployment.model.geronimo.j2ee.JNDIEnvironmentRefs;
-import org.apache.geronimo.deployment.model.geronimo.j2ee.ResourceRef;
-import org.apache.geronimo.deployment.model.j2ee.EnvEntry;
import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.xbeans.j2ee.EjbLocalRefType;
+import org.apache.geronimo.xbeans.j2ee.EjbRefType;
+import org.apache.geronimo.xbeans.j2ee.EnvEntryType;
+import org.apache.geronimo.xbeans.j2ee.ResourceRefType;
/**
*
@@ -88,15 +87,14 @@
/**
* Build a component context from definitions contained in POJOs read
from
* a deployment descriptor.
- * @param refs the source reference definitions
* @return a Context that can be bound to java:comp
*/
-public ReadOnlyContext buildContext(JNDIEnvironmentRefs refs) throws
DeploymentException {
+public ReadOnlyContext buildContext(EjbRefType[] ejbRefs,
EjbLocalRefType[] ejbLocalRefs, EnvEntryType[] envEntries, ResourceRefType[]
resourceRefs) throws DeploymentException {
ReadOnlyContext readOnlyContext = new ReadOnlyContext();
-buildEnvEntries(readOnlyContext, refs.getEnvEntry());
-buildEJBRefs(readOnlyContext, refs.getGeronimoEJBRef());
-buildEJBLocalRefs(readOnlyContext, refs.getGeronimoEJBLocalRef());
-buildResourceRefs(readOnlyContext, refs.getGeronimoResourceRef());
+buildEnvEntries(readOnlyContext, envEntries);
+buildEJBRefs(readOnlyContext, ejbRefs);
+buildEJBLocalRefs(readOnlyContext, ejbLocalRefs);
+buildResourceRefs(readOnlyContext, resourceRefs);
if (userTransaction != null) {
try {
@@ -108,12 +106,12 @@
return readOnlyContext;
}
-private static void buildEnvEntries(ReadOnlyContext readOnlyContext,
EnvEntry[] envEntries) throws DeploymentException {
+private static void buildEnvEntries(ReadOnlyContext readOnlyContext,
EnvEntryType[] envEntries) throws DeploymentException {
for (int i = 0; i envEntries.length; i++) {
-EnvEntry entry = envEntries[i];
-String name = entry.getEnvEntryName();
-String type = entry.getEnvEntryType();
-String value = entry.getEnvEntryValue();
+EnvEntryType entry = envEntries[i];
+
cvs commit: incubator-geronimo/modules/core/src/test/org/apache/geronimo/xml/deployment AbstractLoaderUtilTest.java AppClientLoaderTest.java ConnectorLoaderTest.java EjbJarLoaderTest.java EjbJarStorerTest.java EntityResolverTest.java GeronimoAppClientLoaderTest.java GeronimoConnectorLoaderTest.java GeronimoEjbJarLoaderTest.java GeronimoEjbJarStorerTest.java LoaderUtilTest.java LocalEntityResolverTest.java
djencks 2004/02/12 00:29:06 Removed: modules/core/src/java/org/apache/geronimo/deployment/model DeploymentDescriptor.java modules/core/src/java/org/apache/geronimo/deployment/model/app Application.java Module.java Web.java modules/core/src/java/org/apache/geronimo/deployment/model/appclient ApplicationClient.java modules/core/src/java/org/apache/geronimo/deployment/model/connector ActivationSpec.java AdminObject.java AuthenticationMechanism.java ConfigProperty.java Configurable.java ConnectionDefinition.java Connector.java ConnectorDocument.java InboundResourceAdapter.java License.java MessageAdapter.java MessageListener.java OutboundResourceAdapter.java RequiredConfigProperty.java ResourceAdapter.java SecurityPermission.java modules/core/src/java/org/apache/geronimo/deployment/model/ejb ActivationConfig.java ActivationConfigProperty.java AssemblyDescriptor.java CmpField.java CmrField.java ContainerTransaction.java Ejb.java EjbJar.java EjbJarDocument.java EjbRelation.java EjbRelationshipRole.java Entity.java ExcludeList.java MessageDriven.java Method.java MethodConfiguration.java MethodPermission.java Query.java QueryMethod.java RelationshipRoleSource.java Relationships.java RpcBean.java SecurityIdentity.java Session.java modules/core/src/java/org/apache/geronimo/deployment/model/ejb EnterpriseBeans.java modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/appclient ApplicationClient.java GeronimoAppClientDocument.java modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/connector GeronimoConnectionDefinition.java GeronimoConnectionManagerFactory.java GeronimoConnector.java GeronimoConnectorDocument.java GeronimoInboundResourceAdapter.java GeronimoMessageAdapter.java GeronimoMessageListener.java GeronimoOutboundResourceAdapter.java GeronimoResourceAdapter.java modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/ejb ActivationConfig.java Binding.java EjbJar.java EjbRelation.java EjbRelationshipRole.java EnterpriseBeans.java Entity.java GeronimoEjbJarDocument.java MessageDriven.java Query.java RelationshipQuery.java Relationships.java Session.java modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/j2ee BeanSecurity.java ClassSpace.java DefaultPrincipal.java EjbLocalRef.java EjbRef.java JNDIEnvironmentRefs.java JNDILocator.java JndiContextParam.java MessageDestination.java MessageDestinationRef.java Principal.java Realm.java ResourceEnvRef.java ResourceRef.java Role.java RoleMappings.java Security.java SecurityRoleRef.java ServiceRef.java modules/core/src/java/org/apache/geronimo/deployment/model/geronimo/web GeronimoWebAppDocument.java WebApp.java modules/core/src/java/org/apache/geronimo/deployment/model/j2ee Describable.java Description.java DisplayName.java Displayable.java EJBLocalRef.java EJBRef.java EnvEntry.java Handler.java Icon.java JNDIEnvironmentRefs.java MessageDestination.java MessageDestinationRef.java ParamValue.java PortComponentRef.java ResourceEnvRef.java ResourceRef.java RunAs.java SecurityRole.java SecurityRoleRef.java ServiceRef.java modules/core/src/java/org/apache/geronimo/deployment/model/web AbstractWebApp.java AuthConstraint.java ContextParam.java ErrorPage.java Filter.java FilterMapping.java FormLoginConfig.java InitParam.java JSPConfig.java JSPPropertyGroup.java
cvs commit: incubator-geronimo/modules/security/src/test-data/xml/deployment geronimo-security.xml
djencks 2004/02/12 08:29:00 Modified:modules/connector/src/schema geronimo-connector_1_5.xsd xmlconfig.xml modules/connector/src/test-data/connector_1_0 geronimo-ra.xml modules/connector/src/test-data/connector_1_5 geronimo-ra.xml modules/jetty/src/schema geronimo-jetty.xsd xmlconfig.xml modules/jetty/src/test-resources/deployables/war1 geronimo-web2.xml modules/jetty/src/test-resources/deployables/war1/WEB-INF geronimo-web.xml modules/security/src/schema geronimo-security.xsd xmlconfig.xml modules/security/src/test-data/xml/deployment geronimo-security.xml Log: reverse namespace components to correct order Revision ChangesPath 1.6 +3 -3 incubator-geronimo/modules/connector/src/schema/geronimo-connector_1_5.xsd Index: geronimo-connector_1_5.xsd === RCS file: /home/cvs/incubator-geronimo/modules/connector/src/schema/geronimo-connector_1_5.xsd,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-connector_1_5.xsd10 Feb 2004 19:59:14 - 1.5 +++ geronimo-connector_1_5.xsd12 Feb 2004 16:29:00 - 1.6 @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=UTF-8? xsd:schema xmlns=http://www.w3.org/2001/XMLSchema; -xmlns:ger=http://org.apache.geronimo/xml/ns/j2ee; -targetNamespace=http://org.apache.geronimo/xml/ns/j2ee; +xmlns:ger=http://geronimo.apache.org/xml/ns/j2ee; +targetNamespace=http://geronimo.apache.org/xml/ns/j2ee; xmlns:j2ee=http://java.sun.com/xml/ns/j2ee; xmlns:xsd=http://www.w3.org/2001/XMLSchema; elementFormDefault=qualified @@ -13,7 +13,7 @@ xsd:documentation ![CDATA[ documents using this schema should start like: -connector xmlns=http://org.apache.geronimo/xml/ns/j2ee; +connector xmlns=http://geronimo.apache.org/xml/ns/j2ee; version=1.5 @(#)geronimo-connector_1_5.xsds 1.4 +1 -1 incubator-geronimo/modules/connector/src/schema/xmlconfig.xml Index: xmlconfig.xml === RCS file: /home/cvs/incubator-geronimo/modules/connector/src/schema/xmlconfig.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xmlconfig.xml 9 Feb 2004 23:13:27 - 1.3 +++ xmlconfig.xml 12 Feb 2004 16:29:00 - 1.4 @@ -9,7 +9,7 @@ xb:packageorg.apache.geronimo.xbeans.j2ee.connector_1_0/xb:package /xb:namespace-- -xb:namespace uri=http://org.apache.geronimo/xml/ns/j2ee; +xb:namespace uri=http://geronimo.apache.org/xml/ns/j2ee; xb:packageorg.apache.geronimo.xbeans.geronimo/xb:package xb:prefixGer/xb:prefix /xb:namespace 1.6 +1 -1 incubator-geronimo/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml Index: geronimo-ra.xml === RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_0/geronimo-ra.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-ra.xml 10 Feb 2004 19:59:14 - 1.5 +++ geronimo-ra.xml 12 Feb 2004 16:29:00 - 1.6 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=UTF-8? -connector xmlns=http://org.apache.geronimo/xml/ns/j2ee; version=1.0 +connector xmlns=http://geronimo.apache.org/xml/ns/j2ee; version=1.0 resourceadapter !-- how can we get rid of this?-- resourceadapter-nametestRA/resourceadapter-name 1.6 +1 -1 incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml Index: geronimo-ra.xml === RCS file: /home/cvs/incubator-geronimo/modules/connector/src/test-data/connector_1_5/geronimo-ra.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- geronimo-ra.xml 10 Feb 2004 19:59:14 - 1.5 +++ geronimo-ra.xml 12 Feb 2004 16:29:00 - 1.6 @@ -1,5 +1,5 @@ ?xml version=1.0 encoding=UTF-8? -connector xmlns=http://org.apache.geronimo/xml/ns/j2ee; version=1.5 +connector xmlns=http://geronimo.apache.org/xml/ns/j2ee; version=1.5 resourceadapter resourceadapter-nametestRA/resourceadapter-name config-property-setting name=RAStringPropertyNewStringValue/config-property-setting 1.2 +2 -2 incubator-geronimo/modules/jetty/src/schema/geronimo-jetty.xsd Index: geronimo-jetty.xsd
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx GBeanMBean.java
jboynes 2004/02/12 09:21:16
Modified:modules/kernel/src/java/org/apache/geronimo/gbean/jmx
GBeanMBean.java
Log:
log warning if constructor signatures do not match
Revision ChangesPath
1.7 +8 -2
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java
Index: GBeanMBean.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GBeanMBean.java 25 Jan 2004 21:07:04 - 1.6
+++ GBeanMBean.java 12 Feb 2004 17:21:16 - 1.7
@@ -56,6 +56,7 @@
package org.apache.geronimo.gbean.jmx;
import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -284,7 +285,12 @@
+ . Constructor parameter + i + should be +
assertedType.getName()
+ but is + parameters[i].getClass().getName();
}
-target = constructor.newInstance(parameters);
+try {
+target = constructor.newInstance(parameters);
+} catch (IllegalArgumentException e) {
+log.warn(Constructor mismatch for +returnValue, e);
+throw e;
+}
// bring all of the attributes online
for (Iterator iterator = attributeMap.values().iterator();
iterator.hasNext();) {
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx GBeanMBean.java
jboynes 2004/02/12 09:21:42 Modified:modules/kernel/src/java/org/apache/geronimo/gbean/jmx GBeanMBean.java Log: Remove unused import Revision ChangesPath 1.8 +1 -2 incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java Index: GBeanMBean.java === RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/gbean/jmx/GBeanMBean.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- GBeanMBean.java 12 Feb 2004 17:21:16 - 1.7 +++ GBeanMBean.java 12 Feb 2004 17:21:42 - 1.8 @@ -56,7 +56,6 @@ package org.apache.geronimo.gbean.jmx; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; import java.util.Collections; import java.util.HashMap; import java.util.HashSet;
cvs commit: incubator-geronimo/modules/system - Imported sources
jboynes 2004/02/12 10:12:53 Log: new system module for low level GBeans used in running configurations Status: Vendor Tag: jboynes Release Tags: v0_0 N incubator-geronimo/modules/system/.cvsignore N incubator-geronimo/modules/system/maven.xml N incubator-geronimo/modules/system/project.xml N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/CachingLog4jLog.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/Log4jService.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/NamedNDC.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/NamedNDCConverter.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/NamedNDCFilter.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/PatternLayout.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/PatternParser.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/URLConfigurator.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/XLevel.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/AbstractAppenderService.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/ConsoleAppenderService.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/DailyRollingFileAppenderService.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/FileAppenderService.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/logging/log4j/appender/RollingFileAppenderService.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/repository/ReadOnlyRepository.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerConstants.java N incubator-geronimo/modules/system/src/java/org/apache/geronimo/system/serverinfo/ServerInfo.java No conflicts created by this import
cvs commit: incubator-geronimo/modules/core/src/test/org/apache/geronimo/core/serverinfo ServerInfoTest.java
jboynes 2004/02/12 10:17:17
Modified:modules/core maven.xml project.xml
Removed: modules/core/src/java/org/apache/geronimo/core/logging/log4j
CachingLog4jLog.java Log4jService.java
Log4jSocketServer.java NamedNDC.java
NamedNDCConverter.java NamedNDCFilter.java
PatternLayout.java PatternParser.java
URLConfigurator.java XLevel.java
modules/core/src/java/org/apache/geronimo/core/logging/log4j/appender
AbstractAppenderService.java
ConsoleAppenderService.java
DailyRollingFileAppenderService.java
FileAppenderService.java
RollingFileAppenderService.java
modules/core/src/java/org/apache/geronimo/core/serverinfo
ServerConstants.java ServerInfo.java
modules/core/src/test/org/apache/geronimo/core/logging/log4j
Log4jServiceTest.java
modules/core/src/test/org/apache/geronimo/core/serverinfo
ServerInfoTest.java
Log:
Moved to system module
Revision ChangesPath
1.27 +2 -72 incubator-geronimo/modules/core/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- maven.xml 11 Feb 2004 03:14:10 - 1.26
+++ maven.xml 12 Feb 2004 18:17:17 - 1.27
@@ -5,91 +5,21 @@
project default=default
xmlns:j=jelly:core
xmlns:ant=jelly:ant
-xmlns:maven=jelly:maven
-xmlns:xdoclet=common:xdoclet
-xmlns:castor=common:castor
+
preGoal name=xdoc:jelly-transform
attainGoal name=html2xdoc/
/preGoal
postGoal name=jar:jar
-ant:jar destfile=${basedir}/target/jsr88-geronimo-plugin.jar
-basedir=${basedir}/target/classes
-
includes=org/apache/geronimo/enterprise/deploy/server/**/*.class
-
manifest=${basedir}/src/etc/jsr88-product-provider-manifest.mf/
-/postGoal
-
-postGoal name=jar:jar
ant:jar
destfile=${basedir}/target/geronimo-core-rmiclassloaderspi.jar
basedir=${basedir}/target/classes
includes=org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.class/
/postGoal
-postGoal name=jar:jar
-ant:jar destfile=${basedir}/target/geronimo-schemas.jar
-basedir=${basedir}/src/schema
-includes=*.xsd/
-/postGoal
-
-postGoal name=jar:jar
-ant:jar
destfile=${basedir}/target/log4j-service-${pom.currentVersion}.jar
-fileset dir=${basedir}/target/classes
includes=org/apache/geronimo/core/logging/log4j/**/*.class/
-fileset dir=${basedir}/src/etc/logging
includes=META-INF/geronimo-service.xml/
-j:forEach var=artifact items=${pom.artifacts}
-j:set var=dependency value=${artifact.dependency}/
-j:if test=${dependency.getProperty('log4j-service') ==
'true'}
-fileset file=${artifact.path}/
-/j:if
-/j:forEach
-/ant:jar
-/postGoal
-
postGoal name=jar:install
ant:property name=jardir__
value=${maven.repo.local}/${pom.artifactDirectory}/jars/
ant:mkdir dir=${jardir__}/
-ant:copy
-file=${basedir}/target/log4j-service-${pom.currentVersion}.jar
-todir=${jardir__}
-overwrite=true
-/
/postGoal
-postGoal name=java:compile
-!-- generate the version properties file --
-j:new var=now className=java.util.Date/
-j:new var=dateFormat className=java.text.SimpleDateFormat
-j:arg type=java.lang.String value=.MM.dd/
-/j:new
-j:new var=timeFormat className=java.text.SimpleDateFormat
-j:arg type=java.lang.String value=HH:mm:ss.SSSZ/
-/j:new
-j:new var=yearFormat className=java.text.SimpleDateFormat
-j:arg type=java.lang.String value=/
-/j:new
-ant:echo
file=${basedir}/target/classes/org/apache/geronimo/core/serverinfo/geronimo-version.properties#
Generated by Maven
-version=${pom.currentVersion}
-build.date=${dateFormat.format(now)}
-build.time=${timeFormat.format(now)}
-copyright=Copyright (C) 2003-${yearFormat.format(now)}, The Apache Software
Foundation
-/ant:echo
-/postGoal
-
-postGoal name=jar:jar
-!-- build the server-info jar --
-ant:jar
destfile=${basedir}/target/server-info-${pom.currentVersion}.jar
-fileset dir=${basedir}/target/classes
cvs commit: incubator-geronimo/modules/kernel/src/conf log4j.properties
jboynes 2004/02/12 10:18:08 Modified:modules/common/src/conf log4j.properties modules/kernel/src/conf log4j.properties Log: Reflect move of logging from core to system Revision ChangesPath 1.5 +2 -2 incubator-geronimo/modules/common/src/conf/log4j.properties Index: log4j.properties === RCS file: /home/cvs/incubator-geronimo/modules/common/src/conf/log4j.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- log4j.properties 11 Feb 2004 03:14:10 - 1.4 +++ log4j.properties 12 Feb 2004 18:18:08 - 1.5 @@ -4,7 +4,7 @@ ## $Revision$ $Date$ ## -log4j.category.org.apache.geronimo=TRACE#org.apache.geronimo.core.logging.log4j.XLevel, CONSOLE +log4j.category.org.apache.geronimo=TRACE#org.apache.geronimo.system.logging.log4j.XLevel, CONSOLE log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender log4j.appender.CONSOLE.Threshold=DEBUG 1.5 +3 -3 incubator-geronimo/modules/kernel/src/conf/log4j.properties Index: log4j.properties === RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/conf/log4j.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- log4j.properties 11 Feb 2004 03:14:11 - 1.4 +++ log4j.properties 12 Feb 2004 18:18:08 - 1.5 @@ -4,10 +4,10 @@ ## $Revision$ $Date$ ## -log4j.rootCategory=TRACE#org.apache.geronimo.core.logging.log4j.XLevel, CONSOLE +log4j.rootCategory=TRACE#org.apache.geronimo.system.logging.log4j.XLevel, CONSOLE log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.core.logging.log4j.XLevel +#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.system.logging.log4j.XLevel log4j.appender.CONSOLE.Threshold=INFO log4j.appender.CONSOLE.Target=System.out log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config Configuration.java
jboynes 2004/02/12 10:20:24
Modified:modules/kernel/src/java/org/apache/geronimo/kernel/config
Configuration.java
Log:
Add ParentID as persistent attribute
Used during deployment process to resolve dependencies
Revision ChangesPath
1.10 +24 -5
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
Index: Configuration.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Configuration.java10 Feb 2004 22:34:04 - 1.9
+++ Configuration.java12 Feb 2004 18:20:24 - 1.10
@@ -72,6 +72,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Arrays;
import javax.management.AttributeNotFoundException;
import javax.management.InvalidAttributeValueException;
import javax.management.MBeanException;
@@ -127,6 +128,7 @@
private static final Log log = LogFactory.getLog(Configuration.class);
private final URI id;
+private final URI parentID;
private final ConfigurationParent parent;
private final List classPath;
private final List dependencies;
@@ -150,8 +152,9 @@
* @param repositories a CollectionRepository of repositories used to
resolve dependencies
* @param dependencies a ListURI of dependencies
*/
-public Configuration(URI id, ConfigurationParent parent, List classPath,
byte[] gbeanState, Collection repositories, List dependencies) {
+public Configuration(URI id, URI parentID, ConfigurationParent parent,
List classPath, byte[] gbeanState, Collection repositories, List dependencies) {
this.id = id;
+this.parentID = parentID;
this.parent = parent;
this.gbeanState = gbeanState;
this.classPath = classPath;
@@ -187,6 +190,7 @@
urls[idx++] = new URL(baseURL, uri.toString());
}
assert idx == urls.length;
+log.debug(ClassPath for + id + resolved to +
Arrays.asList(urls));
if (parent == null) {
classLoader = new URLClassLoader(urls);
@@ -198,17 +202,22 @@
gbeans = loadGBeans(gbeanState, classLoader);
// register all the GBeans
+MBeanServer mbServer = context.getServer();
for (Iterator i = gbeans.entrySet().iterator(); i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
ObjectName name = (ObjectName) entry.getKey();
GBeanMBean gbean = (GBeanMBean) entry.getValue();
-MBeanServer mbServer = context.getServer();
+log.trace(Registering GBean + name);
mbServer.registerMBean(gbean, name);
mbServer.invoke(Kernel.DEPENDENCY_SERVICE, addDependency, new
Object[]{name, context.getObjectName()}, new
String[]{ObjectName.class.getName(), ObjectName.class.getName()});
}
+
+log.info(Started configuration + id);
}
public void doStop() {
+log.info(Stopping configuration + id);
+
// unregister all GBeans
MBeanServer mbServer = context.getServer();
for (Iterator i = gbeans.keySet().iterator(); i.hasNext();) {
@@ -220,6 +229,7 @@
log.warn(Could not remove dependency for child + name, e);
}
try {
+log.trace(Unregistering GBean + name);
mbServer.unregisterMBean(name);
} catch (Exception e) {
// ignore
@@ -240,6 +250,14 @@
}
/**
+ * Return the unique ID of this Configuration's parent
+ * @return the unique ID of the parent, or null if it does not have one
+ */
+public URI getParentID() {
+return parentID;
+}
+
+/**
* Return the unique ID
* @return the unique ID
*/
@@ -381,6 +399,7 @@
static {
GBeanInfoFactory infoFactory = new
GBeanInfoFactory(Configuration.class);
infoFactory.addAttribute(new GAttributeInfo(ID, true));
+infoFactory.addAttribute(new GAttributeInfo(ParentID, true));
infoFactory.addAttribute(new GAttributeInfo(ClassPath, true));
infoFactory.addAttribute(new GAttributeInfo(Dependencies, true));
infoFactory.addAttribute(new GAttributeInfo(GBeanState, true));
@@ -391,8 +410,8 @@
infoFactory.addReference(new GReferenceInfo(Parent,
ConfigurationParent.class));
infoFactory.addReference(new GReferenceInfo(Repositories,
Repository.class));
infoFactory.setConstructor(new GConstructorInfo(
-new String[]{ID, Parent, ClassPath,
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel Kernel.java KernelMBean.java
jboynes 2004/02/12 10:22:55
Modified:modules/kernel/src/java/org/apache/geronimo/kernel
Kernel.java KernelMBean.java
Log:
Expose more method over JMX allowing kernel to be used as a reference
Referencing requires NotificationBroadcaster - use API supplied implementation
Add ability to see if a config is loaded and to load parent configs
Revision ChangesPath
1.17 +57 -86
incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
Index: Kernel.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Kernel.java 8 Feb 2004 21:53:20 - 1.16
+++ Kernel.java 12 Feb 2004 18:22:55 - 1.17
@@ -55,6 +55,17 @@
*/
package org.apache.geronimo.kernel;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.net.URI;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import javax.management.InstanceAlreadyExistsException;
import javax.management.InstanceNotFoundException;
import javax.management.ListenerNotFoundException;
@@ -70,15 +81,7 @@
import javax.management.NotificationListener;
import javax.management.ObjectName;
import javax.management.ReflectionException;
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.net.URI;
-import java.net.URL;
-import java.util.Hashtable;
-import java.util.Map;
+import javax.management.NotificationBroadcasterSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -110,7 +113,7 @@
*
* @version $Revision$ $Date$
*/
-public class Kernel implements Serializable, KernelMBean,
NotificationBroadcaster {
+public class Kernel extends NotificationBroadcasterSupport implements
Serializable, KernelMBean{
/**
* The JMX name used by a Kernel to register itself when it boots.
@@ -141,6 +144,16 @@
private transient ConfigurationStore store;
/**
+ * No-arg constructor allowing this class to be used as a GBean
reference.
+ */
+public Kernel() {
+kernelName = null;
+domainName = null;
+storeInfo = null;
+configStore = null;
+}
+
+/**
* Construct a Kernel using the specified JMX domain and supply the
* information needed to create the ConfigurationStore.
* @param kernelName the name of the kernel that uniquely indentifies
the kernel in a VM
@@ -188,18 +201,10 @@
this(domainName, null, null);
}
-/**
- * Get the MBeanServer used by this kernel
- * @return the MBeanServer used by this kernel
- */
public MBeanServer getMBeanServer() {
return mbServer;
}
-/**
- * Get the name of this kernel
- * @return the name of this kernel
- */
public String getKernelName() {
return kernelName;
}
@@ -251,12 +256,6 @@
return new ObjectName(geronimo.config:name= +
ObjectName.quote(configID.toString()));
}
-/**
- * Install the CAR at the supplied URL into this kernel's store
- * @param source the URL of a CAR format archive
- * @throws java.io.IOException if the CAR could not be read
- * @throws org.apache.geronimo.kernel.config.InvalidConfigException if
there is a configuration problem with the CAR
- */
public void install(URL source) throws IOException,
InvalidConfigException {
if (store == null) {
throw new UnsupportedOperationException(Kernel does not have a
ConfigurationStore);
@@ -264,15 +263,26 @@
store.install(source);
}
-/**
- * Load the specified Configuration from the store into this Kernel
- * @param configID the unique id of the Configuration to load
- * @return the JMX ObjectName the Kernel registered the Configuration
under
- * @throws org.apache.geronimo.kernel.config.NoSuchConfigException if
the store does not contain the specified Configuratoin
- * @throws java.io.IOException if the Configuration could not be read
from the store
- * @throws org.apache.geronimo.kernel.config.InvalidConfigException if
the Configuration is not valid
- * @throws java.lang.UnsupportedOperationException if this kernel does
not have a store
- */
+public List loadRecursive(URI configID) throws NoSuchConfigException,
cvs commit: incubator-geronimo/modules/kernel/src/java/org/apache/geronimo Geronimo.java
jboynes 2004/02/12 10:23:58
Modified:modules/kernel/src/java/org/apache/geronimo Geronimo.java
Log:
Allow multiple configs to be started from command line
Initialize the logger properly (?)
Remove maven hooks for now
Revision ChangesPath
1.8 +45 -64
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Geronimo.java 11 Feb 2004 03:14:11 - 1.7
+++ Geronimo.java 12 Feb 2004 18:23:58 - 1.8
@@ -59,13 +59,14 @@
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
-import java.net.URL;
-import javax.management.ObjectName;
+import java.util.ArrayList;
+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.log.GeronimoLogFactory;
import org.apache.geronimo.kernel.config.LocalConfigStore;
-import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.kernel.log.GeronimoLogFactory;
/**
* @version $Revision$ $Date$
@@ -89,91 +90,71 @@
* will remain running until the shutdown() method on the kernel is
* invoked or until the JVM exits.
* @param args
+ * @todo commons-cli support
+ * @todo save list of started configurations and restart them next time
*/
-public static void main(String[] args) throws Exception {
+public static void main(String[] args) {
if (args.length 2) {
-System.err.println(usage: + Geronimo.class.getName() +
config-store-dir config-id);
+System.err.println(usage: + Geronimo.class.getName() +
config-store-dir config-id...);
System.exit(1);
}
String storeDirName = args[0];
-URI configID = null;
-try {
-configID = new URI(args[1]);
-} catch (URISyntaxException e) {
-e.printStackTrace();
-System.exit(1);
-}
-String domain = geronimo;
-
-Kernel kernel = null;
-try {
-kernel = createKernel(domain, storeDirName);
-} catch (IllegalArgumentException e) {
-System.err.println(e.getMessage());
-System.exit(1);
-} catch (Exception e) {
-e.printStackTrace();
-System.exit(2);
-}
-try {
-kernel.load(configID);
-} catch (Exception e) {
-kernel.shutdown();
-e.printStackTrace();
-System.exit(3);
-}
-kernel.getMBeanServer().invoke(new
ObjectName(geronimo.config:name= + ObjectName.quote(args[1])),
startRecursive, null, null);
-while (kernel.isRunning()) {
+List configs = new ArrayList();
+for (int i = 1; i args.length; i++) {
+URI configID;
try {
-synchronized (kernel) {
-kernel.wait();
-}
-} catch (InterruptedException e) {
-// continue
+configID = new URI(args[i]);
+} catch (URISyntaxException e) {
+System.err.println(Invalid config-id: + args[i]);
+e.printStackTrace();
+System.exit(1);
+throw new AssertionError();
}
+configs.add(configID);
}
-}
-public static Kernel createKernel(String domain, String storeDirName)
throws Exception {
+final Kernel kernel;
File storeDir = new File(storeDirName);
if (storeDir.exists()) {
if (!storeDir.isDirectory() || !storeDir.canWrite()) {
-throw new IllegalArgumentException(Store location is not a
writable directory: + storeDir);
+System.err.println(Store location is not a writable
directory: + storeDir);
+System.exit(2);
+throw new AssertionError();
}
} else {
if (!storeDir.mkdirs()) {
-throw new IllegalArgumentException(Could not create store
directory: + storeDir);
+System.err.println(Could not create store directory: +
storeDir);
+System.exit(2);
+throw new AssertionError();
}
}
-final Kernel kernel = new Kernel(geronimo.kernel, domain,
LocalConfigStore.GBEAN_INFO, storeDir);
+kernel = new Kernel(geronimo.kernel, geronimo,
LocalConfigStore.GBEAN_INFO, storeDir);
cvs commit: incubator-geronimo/modules/deployment/src/test/org/apache/geronimo/deployment/service ParentDeployerTest.java ServiceDeployerTest.java
jboynes 2004/02/12 10:27:39
Modified:modules/deployment project.xml
modules/deployment/src/java/org/apache/geronimo/deployment
Bootstrap.java
modules/deployment/src/schema geronimo-common.xsd
geronimo-config.xsd
modules/deployment/src/test-resources/services plan1.xml
Added: modules/deployment/src/java/org/apache/geronimo/deployment
ConfigurationBuilder.java Deployer.java
DeploymentContext.java
modules/deployment/src/java/org/apache/geronimo/deployment/service
ServiceConfigBuilder.java
Removed: modules/deployment/src/java/org/apache/geronimo/deployment
BatchDeployerFactory.java JARDeployer.java
modules/deployment/src/java/org/apache/geronimo/deployment/tools
DeployCommand.java
modules/deployment/src/java/org/apache/geronimo/deployment/util
ExplicitDeployment.java
modules/deployment/src/test/org/apache/geronimo/deployment
JARDeployerTest.java
modules/deployment/src/test/org/apache/geronimo/deployment/service
ParentDeployerTest.java ServiceDeployerTest.java
Log:
new GBean based service deployer
deprecate old DeploymentModule API
remove old service deployer using it
todo: remove DeploymentModule API when war and connector deployers are
updated
new Bootstrap class which is invoked from maven during the build to intialize
the deployers
Revision ChangesPath
1.10 +9 -1 incubator-geronimo/modules/deployment/project.xml
Index: project.xml
===
RCS file: /home/cvs/incubator-geronimo/modules/deployment/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 9 Feb 2004 07:17:31 - 1.9
+++ project.xml 12 Feb 2004 18:27:39 - 1.10
@@ -52,6 +52,14 @@
/dependency
dependency
+groupIdgeronimo/groupId
+artifactIdgeronimo-system/artifactId
+versionDEV/version
+properties
+/properties
+/dependency
+
+dependency
groupIdgeronimo-spec/groupId
artifactIdgeronimo-spec-j2ee-deployment/artifactId
versionDEV/version
1.6 +92 -74
incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
Index: Bootstrap.java
===
RCS file:
/home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bootstrap.java4 Feb 2004 05:43:31 - 1.5
+++ Bootstrap.java12 Feb 2004 18:27:39 - 1.6
@@ -55,108 +55,126 @@
*/
package org.apache.geronimo.deployment;
+import java.io.BufferedOutputStream;
import java.io.File;
-import java.net.MalformedURLException;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
import java.net.URI;
-import java.net.URL;
import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
+import java.util.Map;
+import java.util.jar.JarEntry;
+import java.util.jar.JarOutputStream;
+import java.util.zip.ZipEntry;
import javax.management.ObjectName;
-import org.apache.geronimo.deployment.service.ServiceDeployer;
-import org.apache.geronimo.deployment.util.FileUtil;
+import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
+import org.apache.geronimo.gbean.jmx.GBeanMBean;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.LocalConfigStore;
-import org.apache.geronimo.deployment.util.URLInfo;
-import org.apache.geronimo.deployment.util.URLType;
+import org.apache.geronimo.system.repository.ReadOnlyRepository;
+import org.apache.geronimo.system.serverinfo.ServerInfo;
/**
- * Helper class to bootstrap a Geronimo instance from a service archive.
- * This deploys the service definition to create a bootstrap Configuration,
- * and then creates a Kernel to run that configuration. This allows someone
- * to boot a Kernel without pre-deploying and installing the Configuration.
+ * Helper class to bootstrap the Geronimo deployer.
*
* @version $Revision$ $Date$
*/
public class Bootstrap {
-public
cvs commit: incubator-geronimo/assembly/src - New directory
jboynes 2004/02/12 10:29:48 incubator-geronimo/assembly/src - New directory
cvs commit: incubator-geronimo/assembly/src/etc - New directory
jboynes 2004/02/12 10:29:54 incubator-geronimo/assembly/src/etc - New directory
cvs commit: incubator-geronimo/modules/maven-plugin project.xml
jboynes 2004/02/12 10:31:16
Modified:assembly maven.xml project.xml
modules/maven-plugin project.xml
Added: assembly/src/etc resolver-catalog.xml
assembly/src/plan server-config.xml system-config.xml
Log:
Updated for new deployer and configuration dependency support
Revision ChangesPath
1.6 +96 -12incubator-geronimo/assembly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 11 Feb 2004 03:14:10 - 1.5
+++ maven.xml 12 Feb 2004 18:31:16 - 1.6
@@ -25,12 +25,13 @@
!-- --
goal name=default
-attainGoal name=deploy:server/
-attainGoal name=install:server/
+!--attainGoal name=deploy:server/--
+!--attainGoal name=install:server/--
+attainGoal name=build/
/goal
goal name=build
-attainGoal name=default/
+attainGoal name=assemble/
/goal
goal name=rebuild
@@ -39,34 +40,116 @@
/goal
!-- --
-!-- Helper to run Apache Geronimo from the current build --
+!-- Assemble server installation from generated modules --
!-- --
-goal name=deploy:server
+goal name=assemble
!-- Copy the runtime dependencies into lib and create a classpath
for the server.jar file --
j:set var=libDir value=target/lib/
ant:mkdir dir=${libDir}/
j:forEach var=artifact items=${pom.artifacts}
j:set var=dependency value=${artifact.dependency}/
-j:if test=${dependency.getProperty('runtime') == 'true'}
-ant:echoProcessing dependency: ${dependency.id}/ant:echo
+j:if test=${dependency.getProperty('lib') == 'true'}
ant:copy todir=${libDir} file=${artifact.path}/
j:set var=classpath value=${classpath}
../lib/${artifact.name}/
/j:if
+j:if test=${dependency.getProperty('server') == 'true'}
+j:set var=server.classpath value=${server.classpath}
../lib/${artifact.name}/
+/j:if
+j:if test=${dependency.getProperty('deploy') == 'true'}
+j:set var=deploy.classpath value=${deploy.classpath}
../lib/${artifact.name}/
+/j:if
+j:if test=${dependency.artifactId == 'geronimo-system'}
+j:set var=system.artifact value=${artifact.path}/
+/j:if
/j:forEach
-j:set var=classpath value=${classpath.trim()}/
-!-- Create the server.jar file --
+!-- Create directory for XML schema documents --
+ant:mkdir dir=target/schema/
+ant:copy todir=target/schema flatten=true
+ant:fileset dir=${project.root}/specs/schema
+ant:include name=src/j2ee_1_4schema/*.xsd/
+ant:include name=src/j2ee_1_3dtd/*.dtd/
+/ant:fileset
+ant:fileset dir=${project.root}/modules/deployment
+ant:include name=src/schema/*.xsd/
+/ant:fileset
+ant:fileset dir=src/etc/
+/ant:copy
+
+!-- Pre-load the server's repository --
+ant:mkdir dir=target/repository/
+ant:copy todir=target/repository
+ant:fileset dir=${maven.repo.local}
+ant:include name=geronimo/**/
+ant:include name=geronimo-spec/**/
+ant:include name=geronimo-j2ee/**/
+ant:include name=log4j/jars/log4j-1.2.8.jar/
+ant:include
name=jetty/jars/org.mortbay.jetty-5.0.beta0.jar/
+ant:include name=tomcat/jars/jasper-compiler-5.0.16.jar/
+ant:include name=tomcat/jars/jasper-runtime-5.0.16.jar/
+ant:include name=commons-el/jars/commons-el-1.0.jar/
+ant:include name=ant/jars/ant-1.5.jar/
+/ant:fileset
+/ant:copy
+
+!-- 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=${classpath}/
+attribute name=Class-Path value=${server.classpath}/
+/manifest
+/ant:jar
+
+!-- Create the deploy.jar file used to deploy things --
cvs commit: incubator-geronimo/specs/j2ee project.xml
dain2004/02/12 11:47:35 Modified:specs/j2ee project.xml Log: The jar was gettting put in the wrong group... changed it to geronimo-spec Revision ChangesPath 1.4 +2 -2 incubator-geronimo/specs/j2ee/project.xml Index: project.xml === RCS file: /home/cvs/incubator-geronimo/specs/j2ee/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 12 Feb 2004 03:17:54 - 1.3 +++ project.xml 12 Feb 2004 19:47:35 - 1.4 @@ -6,7 +6,7 @@ pomVersion3/pomVersion nameGeronimo :: J2EE Specification/name -groupIdgeronimo-j2ee/groupId +groupIdgeronimo-spec/groupId idgeronimo-spec-j2ee/id currentVersionDEV/currentVersion
cvs commit: incubator-geronimo/modules/naming - New directory
djencks 2004/02/12 12:07:09 incubator-geronimo/modules/naming - New directory
cvs commit: incubator-geronimo/modules/naming/src - New directory
djencks 2004/02/12 12:07:32 incubator-geronimo/modules/naming/src - New directory
cvs commit: incubator-geronimo/modules/naming/src/java - New directory
djencks 2004/02/12 12:08:01 incubator-geronimo/modules/naming/src/java - New directory
cvs commit: incubator-geronimo/modules/naming/src/test-data - New directory
djencks 2004/02/12 12:08:01 incubator-geronimo/modules/naming/src/test-data - New directory
cvs commit: incubator-geronimo/modules/naming/src/test - New directory
djencks 2004/02/12 12:08:01 incubator-geronimo/modules/naming/src/test - New directory
cvs commit: incubator-geronimo/modules/naming/src/java/org - New directory
djencks 2004/02/12 12:08:27 incubator-geronimo/modules/naming/src/java/org - New directory
cvs commit: incubator-geronimo/modules/naming/src/test/org/apache - New directory
djencks 2004/02/12 12:08:48 incubator-geronimo/modules/naming/src/test/org/apache - New directory
cvs commit: incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming - New directory
djencks 2004/02/12 12:09:28 incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming - New directory
cvs commit: incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming - New directory
djencks 2004/02/12 12:09:28 incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming - New directory
cvs commit: incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/geronimo - New directory
djencks 2004/02/12 12:10:11 incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/geronimo - New directory
cvs commit: incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/java - New directory
djencks 2004/02/12 12:10:11 incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/java - New directory
cvs commit: incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/java - New directory
djencks 2004/02/12 12:10:11 incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/java - New directory
cvs commit: incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/jmx - New directory
djencks 2004/02/12 12:10:11 incubator-geronimo/modules/naming/src/test/org/apache/geronimo/naming/jmx - New directory
cvs commit: incubator-geronimo/etc project.xml
dain2004/02/12 12:19:29 Modified:etc project.xml Log: Changed issue tracker to http://issues.apache.org/jira/ Revision ChangesPath 1.20 +2 -2 incubator-geronimo/etc/project.xml Index: project.xml === RCS file: /home/cvs/incubator-geronimo/etc/project.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- project.xml 2 Feb 2004 22:05:54 - 1.19 +++ project.xml 12 Feb 2004 20:19:29 - 1.20 @@ -26,7 +26,7 @@ descriptionGeronimo J2EE Application Server/description shortDescriptionGeronimo J2EE Application Server/shortDescription urlhttp://incubator.apache.org/projects/geronimo//url - issueTrackingUrlhttp://jira.codehaus.org/secure/BrowseProject.jspa?id=10220/issueTrackingUrl + issueTrackingUrlhttp://issues.apache.org/jira/secure/BrowseProject.jspa?id=10220/issueTrackingUrl siteAddressincubator.apache.org/siteAddress siteDirectory/www/incubator.apache.org/geronimo/siteDirectory
[Apache Geronimo Wiki] Updated: BuildingAndRunning
Date: 2004-02-12T12:43:48
Editor: 209.233.18.245
Wiki: Apache Geronimo Wiki
Page: BuildingAndRunning
URL: http://wiki.apache.org/geronimo/BuildingAndRunning
no comment
Change Log:
--
@@ -10,6 +10,23 @@
+= For the impatient ... =
+
+Assuming you have Maven 1.0-RC1 installed.
+{{{
+$ cvs -qz3 -d:pserver:[EMAIL PROTECTED]:/home/cvspublic co incubator-geronimo
+$ cd incubator-geronimo
+$ cvs -qz3 update -dP
+$ maven plugins
+$ maven
+$ cd assembly
+$ maven
+$ java -Dgeronimo.base.dir=target -jar target/bin/server.jar
target/config-store org/apache/geronimo/System org/apache/geronimo/Server
+}}}
+
+You should check back here occasionally as things may well change.
+
+
= New To Maven? =
You don't build this project with Ant (directly), you build it with Maven.
Maven manages downloading all the external dependencies for you, as well as
handling the large number of modules to build and then creating one
consolidated Geronimo build based on that.
@@ -50,8 +67,7 @@
= Building Offline =
If you're not online (so Maven fails to download), use the -o flag to maven
(i.e. run `maven -o`).
-
-`??maven -o seems to be not working ??`
+
= Bypassing Tests =
If you don't want to run test at all, try adding `-Dmaven.test.skip=true` to
your maven command line.
@@ -77,17 +93,36 @@
= Running The Server =
== For HEAD revision: ==
-(Jan 29, 2004) Deploying and running applications is now a multi step
process. There is a maven plugin to help with the needed tasks. The current
examples are in the assembly directory, and there are maven goals to run each
step. Currently only gbean packages can be reliably deployed, although we
expect this to change rapidly.
+(Feb 12, 2004) Deployment is still changing but hopefully is a little less
fraught than it has been for the last couple of weeks. There is a now a
standalone deployer (bin/deploy.jar) that is a front-end to a GBean based
deployment system. Currently there is a GBean deployer but work is going on to
move the WAR and RAR deployers over.
-1. Prepare your package. For gbean packages this should be a jar or zip file
with class jars at the root and a META-INF/geronimo-service.xml file. The
class jars need to be listed in path elements in geronimo-service.xml.
Geronimo modules can include dependency jars in the package by including
packagetrue/package in the dependency's property section. Packages are
built automatically for geronimo modules with a
src/etc/META-INF/geronimo-service.xml file.
+Configurations are pre-built for the Geronimo server.
-2. Deploy your package singly or in combination with other packages. This
converts whatever you are deploying into the gbeans that will exist on the
running Geronimo server and serializes the persistent GBean state and the
classes needed into a .car (configuration archive). There is a maven plugin
task def to help with this. An example is the assembly deploy:server goal
which deploys a geronimo server. (It should have pretty much everything we have
working in it).
+||Config ID||Purpose||
+||org/apache/geronimo/System||Critical services for all server configurations||
+||org/apache/geronimo/Server||Normal server configuration||
-3. Install your configuration archive into a servers local configuration
store. This informs the server that the configuration exists and indexes it.
There is a maven plugin task to help with this. An example is the assembly
install:server goal which installs the configuration constructed in (1).
+To run these use the `server.jar` command:
+{{{
+$ cd assembly/target
+$ java -Dgeronimo.base.dir=. -jar bin/server.jar config-store
org/apache/geronimo/System org/apache/geronimo/Server
+}}}
+
+To stop the server use ctrl-C or an equivilent; a proper shutdown command will
be made available when the deployment includes the remoting framework.
+
+The deployer uses an XML deployment plan to figure out what to do. Ultimately
this will be produced by a JSR-88 tool but for now an XML aware text editor is
the best choice. The deployer uses the namespace of this file to select an
appropriate builder.
-4. Start a server with a particular configuration. This can be done from
maven in-vm using the load or loadAndWait tasks, examples being load:server
and loadAndWait:server, or in a separate vm, examples being run:server and
debug:server.
+||Namespace||Schema file||Root Element||Type||
+||http://geronimo.apache.org/xml/ns/deployment||geronimo-config.xsd||configuration||GBean
configuration||
+
+You can find the schema files in ${geronimo.base.dir}/schema
+
+To deploy a new configuation use the `deploy.jar` command:
+{{{
+$ cd assembly/target
+$ java -Dgeronimo.base.dir=. -jar bin/deploy.jar --install --plan
your-plan.xml --store config-store --deployer
org/apache/geronimo/ServiceDeployer
+}}}
-There is also a do it all deployinstallrun
cvs commit: incubator-geronimo/assembly/src/plan server-config.xml
dain2004/02/12 13:15:51
Modified:assembly maven.xml
assembly/src/plan server-config.xml
Log:
updated geronimo-j2ee-spec jar location
Revision ChangesPath
1.7 +1 -2 incubator-geronimo/assembly/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 12 Feb 2004 18:31:16 - 1.6
+++ maven.xml 12 Feb 2004 21:15:51 - 1.7
@@ -82,7 +82,6 @@
ant:fileset dir=${maven.repo.local}
ant:include name=geronimo/**/
ant:include name=geronimo-spec/**/
-ant:include name=geronimo-j2ee/**/
ant:include name=log4j/jars/log4j-1.2.8.jar/
ant:include
name=jetty/jars/org.mortbay.jetty-5.0.beta0.jar/
ant:include name=tomcat/jars/jasper-compiler-5.0.16.jar/
1.2 +1 -1 incubator-geronimo/assembly/src/plan/server-config.xml
Index: server-config.xml
===
RCS file: /home/cvs/incubator-geronimo/assembly/src/plan/server-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- server-config.xml 12 Feb 2004 18:31:16 - 1.1
+++ server-config.xml 12 Feb 2004 21:15:51 - 1.2
@@ -13,7 +13,7 @@
dependency
-urigeronimo-j2ee/jars/geronimo-spec-j2ee-DEV.jar/uri
+urigeronimo-spec/jars/geronimo-spec-j2ee-DEV.jar/uri
/dependency
dependency
urigeronimo/jars/geronimo-jetty-DEV.jar/uri
cvs commit: incubator-geronimo/etc maven.xml
jboynes 2004/02/12 15:23:54
Modified:etc maven.xml
Log:
new dependency schema does not require double nesting
get rid of builds for -service-package.jar's
Revision ChangesPath
1.28 +1 -32 incubator-geronimo/etc/maven.xml
Index: maven.xml
===
RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- maven.xml 29 Jan 2004 02:43:41 - 1.27
+++ maven.xml 12 Feb 2004 23:23:53 - 1.28
@@ -185,35 +185,4 @@
ant:touch file=${basedir}/target/test-reports/tstamp/
/j:if
/postGoal
-
-!-- generate packages ready to be deployed, if appropriate --
-postGoal name=jar:jar
-ant:available property=geronimoServicePresent
file=${basedir}/src/etc/META-INF/geronimo-service.xml/
-j:if test=${geronimoServicePresent == 'true'}
-ant:jar
destfile=${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar
-fileset dir=${basedir}/target
includes=${pom.artifactId}-${pom.currentVersion}.jar/
-fileset dir=${basedir}/src/etc
includes=META-INF/geronimo-service.xml/
-j:forEach var=artifact items=${pom.artifacts}
-j:set var=dependency value=${artifact.dependency}/
-j:if test=${dependency.getProperty('package') ==
'true'}
-ant:echoProcessing dependency:
${dependency.id}/ant:echo
-fileset file=${artifact.path}/
-/j:if
-/j:forEach
-/ant:jar
-/j:if
-/postGoal
-
-postGoal name=jar:install
-ant:available property=geronimoPackagePresent
file=${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar/
-j:if test=${geronimoPackagePresent == 'true'}
-ant:property name=jardir__
value=${maven.repo.local}/${pom.artifactDirectory}/jars/
-ant:mkdir dir=${jardir__}/
-ant:copy
-
file=${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar
-todir=${jardir__}
-overwrite=true
-/
-/j:if
-/postGoal
/project
cvs commit: incubator-geronimo/modules/jetty project.xml
jboynes 2004/02/12 15:33:22
Modified:modules/jetty project.xml
Log:
include xmlbeans schema resources
Revision ChangesPath
1.15 +5 -1 incubator-geronimo/modules/jetty/project.xml
Index: project.xml
===
RCS file: /home/cvs/incubator-geronimo/modules/jetty/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 12 Feb 2004 23:21:53 - 1.14
+++ project.xml 12 Feb 2004 23:33:21 - 1.15
@@ -230,6 +230,10 @@
resource
directory${basedir}/src/etc/directory
/resource
+resource
+directory${basedir}/target/xmlbeans/directory
+includesschema/**/includes
+/resource
/resources
unitTest
includes
