I've attached a patch which I think cleans up the fulcrum build system
quite a bit. It makes the following changes:
* Build Process:
It now utilizes the torque maven plugin - so please install it before
using. (This _really_ needs to be distributed standalone. So, you can
download my copy here:
http://dan.envoisolutions.com/torque-plugin.tar.gz Just unzip in the
maven/plugins directory. Also, use my snapshot below in your
project.xml so the plugin works.)
* Project.xml
Updated project.xml to point to better jars: A torque snap shot resides
here which must be put on ibiblio:
http://dan.envoisolutions.com/torque-3.1-dev.20021225.031342.jar
It also now uses a snapshot of commons-util which is on ibiblio (the
snapshot referred to in the project.xml did not exist on ibiblio).
I also made it so the avalon-roles.xml is now correctly included in the
jar with the latest maven HEAD build.
* Schemas
I moved the schemas to src/schema. My patch removes them from the root
of the cvs directory, and expects them to be into src/schema. Someone
must reimport them. I also did away with the funky package name
configuration. Currently the package names for the security and
scheduler frameworks are in project.properties. Since torque allows a
"package" attribute in the xml schema I just put the package name in the
xml schema. This way it works with the torque plugin. This is good. I
figure it doesn't make any more sense to change it in project.properties
than it does in the actual schema.
My copies of the schemas can be downloaded here:
http://dan.envoisolutions.com/scheduler-schema.xml
http://dan.envoisolutions.com/turbine-schema.xml
* Other
I also did nother misc. import fixes and other build corrections for
torque 3.1
And, in case your wondering, all the tests still pass for me. Hope you
like it. At least now everything builds. Comments?
Happy Holidays,
- Dan Diephouse
Index: maven.xml
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-fulcrum/maven.xml,v
retrieving revision 1.7
diff -u -r1.7 maven.xml
--- maven.xml 11 Oct 2002 03:52:44 -0000 1.7
+++ maven.xml 26 Dec 2002 06:21:19 -0000
@@ -10,132 +10,16 @@
<!-- ================================================================== -->
<preGoal name="java:compile">
-
- <attainGoal name="check-om"/>
-
- <path id="maven.compile.src.set">
- <pathelement location="${pom.build.SourceDirectory}"/>
- </path>
-
- <j:if test="${omGenerated != 'true'}">
-
- <echo>Generating sources ...</echo>
-
- <!--
- We could create a fileset in the project to manage this
- but we should really only have one source directory.
+
+ <!--
+ Copy sources to a temporary directory so they aren't
+ corrupted with the generated sources
-->
-
- <copy todir="${maven.prepareSourceDirectory}" overwrite="yes">
- <fileset dir="src/java"/>
+ <copy todir="target/src">
+ <fileset dir="${maven.src.dir}/java" />
</copy>
-
- <attainGoal name="security-om"/>
- <attainGoal name="scheduler-om"/>
-
- </j:if>
+ <attainGoal name="torque:om"/>
</preGoal>
-
- <!-- ================================================================== -->
- <!-- C H E C K O M -->
- <!-- ================================================================== -->
-
- <!-- this will soon be moved into the security services build. -->
-
- <goal name="check-om">
-
- <property
- name="omStatusFile"
- value="${maven.prepareSourceDirectory}/report.turbine.om.generation"
- />
-
- <j:set var="omGenerated" value="false"/>
-
- <uptodate
- property="omGenerated"
- targetfile="${omStatusFile}">
- <srcfiles
- dir="."
- includes="turbine-schema.xml"
- />
- </uptodate>
-
- </goal>
-
- <goal
- name="init-taskdef">
-
- <taskdef name="torque-om"
- classname="org.apache.torque.task.TorqueDataModelTask">
- <classpath refid="maven.dependency.classpath"/>
- </taskdef>
-
- </goal>
-
- <goal
- name="security-om"
- prereqs="init-taskdef">
-
-<echo>
-+--------------------------------------------------------------------
-|
-| G E N E R A T I N G S E C U R I T Y S O U R C E S
-|
-+--------------------------------------------------------------------
-</echo>
-
- <filter token="DATABASE_DEFAULT" value="${security.database.name}"/>
- <!-- is there a way to load this from an xml file? -->
- <filter token="EXTRA_USER_COLUMNS" value="${security.extra.user.columns}"/>
- <copy
- todir="${maven.prepareSourceDirectory}"
- file="${schemaDirectory}/turbine-schema.xml"
- filtering="yes"
- />
-
- <torque-om
- contextProperties="project.properties"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${maven.prepareSourceDirectory}"
- useClasspath="true"
- outputFile="report.turbine.om.generation"
- targetPackage="${securityPackage}"
- xmlFile="${maven.prepareSourceDirectory}/turbine-schema.xml"
- targetDatabase="${database}"
- />
-
- </goal>
-
- <goal
- name="scheduler-om"
- prereqs="init-taskdef">
-
-<echo>
-+--------------------------------------------------------------------
-|
-| G E N E R A T I N G S C H E D U L E R S O U R C E S
-|
-+--------------------------------------------------------------------
-</echo>
-
- <filter token="DATABASE_DEFAULT" value="${scheduler.database.name}"/>
- <copy
- todir="${maven.prepareSourceDirectory}"
- file="${schemaDirectory}/scheduler-schema.xml"
- filtering="yes"
- />
-
- <torque-om
- contextProperties="project.properties"
- controlTemplate="${OMControlTemplate}"
- outputDirectory="${maven.prepareSourceDirectory}"
- useClasspath="true"
- outputFile="report.turbine.scheduler.generation"
- targetPackage="${schedulerPackage}"
- xmlFile="${maven.prepareSourceDirectory}/scheduler-schema.xml"
- />
-
- </goal>
</project>
Index: project.properties
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-fulcrum/project.properties,v
retrieving revision 1.6
diff -u -r1.6 project.properties
--- project.properties 4 Nov 2002 05:36:47 -0000 1.6
+++ project.properties 26 Dec 2002 06:21:19 -0000
@@ -11,46 +11,29 @@
maven.prepareSourceTarget = om
maven.jarResources.basedir = ${basedir}/target/src
-src.dir = src
-build.src = src/java
-
# -------------------------------------------------------------------
#
-# T O R Q U E C O N F I G U R A T I O N
+# T O R Q U E S E T T I N G S
#
-# used to generate the om/peer classes for the Turbine-db-security
-# system
# -------------------------------------------------------------------
-# FIXME: torque properties should be loaded from torque.dir
-# If you rename the jakarta-turbine-torque module after checkout,
-# you'll have to change this value.
-torque.dir = ${basedir}/../jakarta-turbine-torque
-
-database=mysql
-addSaveMethod=true
-addGetByNameMethod=true
-complexObjectModel=true
-addIntakeRetrievable=true
-basePrefix=Base
-torque.saveException = Exception
-
-schemaDirectory=.
-
-outputDirectory=${build.src}/sql
-
-SQLControlTemplate = sql/base/Control.vm
-OMControlTemplate = om/Control.vm
-IntakeControlTemplate = intake/Control.vm
-ServiceControlTemplate = service/Control.vm
-idTableControlTemplate = sql/id-table/Control.vm
-DataDTDControlTemplate = data/Control.vm
-DataDumpControlTemplate = data/dump/Control.vm
-DataSQLControlTemplate = sql/load/Control.vm
-securityControlTemplate = sql/security/Control.vm
+torque.project = jakarta-turbine-fulcrum
+torque.database = mysql
+torque.contextProperties = project.properties
+torque.runOnlyOnSchemaChange = false
+
+torque.schema.dir = src/schema
+torque.sql.dir = target/sql
+torque.java.dir = target/src/java
+torque.doc.dir = target/sql
+torque.lib.dir = ${maven.repo.local}
+torque.doc.format = html
+
+torque.addIntakeRetrievable=false
+torque.targetPackage = org.apache.fulcrum
+torque.addGetByNameMethod = true
+torque.addTimeStamp = true
+torque.useManagers = false
+torque.useClasspath = true
-securityPackage=org.apache.fulcrum.security.impl.db.entity
-schedulerPackage=org.apache.fulcrum.schedule
-security.database.name = default
-scheduler.database.name = default
-security.extra.user.columns=
+torque.initialID = 1001
\ No newline at end of file
Index: project.xml
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-fulcrum/project.xml,v
retrieving revision 1.53
diff -u -r1.53 project.xml
--- project.xml 4 Nov 2002 05:36:47 -0000 1.53
+++ project.xml 26 Dec 2002 06:21:19 -0000
@@ -163,7 +163,7 @@
</dependency>
<dependency>
<id>commons-util</id>
- <version>SNAPSHOT</version>
+ <version>1.0-rc2-dev.20021217.063141</version>
</dependency>
<dependency>
<id>cryptix</id>
@@ -216,7 +216,7 @@
</dependency>
<dependency>
<id>torque</id>
- <version>SNAPSHOT</version>
+ <version>3.1-dev.20021225.031342</version>
<url>http://jakarta.apache.org/turbine/torque/</url>
</dependency>
<dependency>
@@ -240,15 +240,12 @@
</dependency>
<dependency>
<id>xerces</id>
- <type>required</type>
<version>2.0.2</version>
- <jar>xercesImpl-2.0.2.jar</jar>
<url>http://xml.apache.org/xerces2-j/index.html</url>
</dependency>
<dependency>
<id>xml-apis</id>
- <type>required</type>
- <version>2.0.2</version>
+ <version>1.0.b2</version>
<url>http://xml.apache.org/xerces2-j/index.html</url>
</dependency>
<dependency>
@@ -258,7 +255,7 @@
</dependencies>
<build>
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectory>target/src</sourceDirectory>
+ <sourceDirectory>target/src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<aspectSourceDirectories/>
@@ -272,9 +269,13 @@
</unitTest>
<resources>
- <includes>
- <include>**/avalon-roles.xml</include>
- </includes>
+ <resource>
+ <directory>src/java/org/apache/fulcrum</directory>
+ <targetPath>org/apache/fulcrum</targetPath>
+ <includes>
+ <include>avalon-roles.xml</include>
+ </includes>
+ </resource>
</resources>
<jars/>
Index: scheduler-schema.xml
===================================================================
RCS file: scheduler-schema.xml
diff -N scheduler-schema.xml
--- scheduler-schema.xml 13 Nov 2001 05:35:43 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd";>
-
-<!-- ==================================================================== -->
-<!-- -->
-<!-- S C H E D U L E R T U R B I N E S C H E M A -->
-<!-- -->
-<!-- ==================================================================== -->
-<!-- This is the the XML schema used by Torque to generate the necessary -->
-<!-- sources used to create/initialize the Turbine scheduler service. -->
-<!-- Torque will create the SQL for the database, and the Peer-based -->
-<!-- Object Model. -->
-<!-- ==================================================================== -->
-<!-- @author: <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a> -->
-<!-- @version $Id: scheduler-schema.xml,v 1.2 2001/11/13 05:35:43 jmcnally Exp $ -->
-<!-- ==================================================================== -->
-
-<database name="@DATABASE_DEFAULT@">
-
- <table name="TURBINE_SCHEDULED_JOB" idMethod="idbroker" javaName="JobEntry">
- <column name="JOB_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="JOB_SECOND" javaName="Second" default="-1"
- required="true" type="INTEGER"/>
- <column name="JOB_MINUTE" javaName="Minute" default="-1"
- required="true" type="INTEGER"/>
- <column name="JOB_HOUR" javaName="Hour" default="-1"
- required="true" type="INTEGER"/>
- <column name="WEEK_DAY" default="-1" required="true" type="INTEGER"/>
- <column name="DAY_OF_MONTH" default="-1" required="true" type="INTEGER"/>
- <column name="TASK" required="true" size="99" type="VARCHAR"/>
- <column name="EMAIL" size="99" type="VARCHAR"/>
- <column name="JOB_PROPERTY" javaName="Property" type="VARBINARY"/>
- </table>
-
-</database>
Index: turbine-schema.xml
===================================================================
RCS file: turbine-schema.xml
diff -N turbine-schema.xml
--- turbine-schema.xml 13 Nov 2001 05:35:43 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "http://jakarta.apache.org/turbine/dtd/database.dtd";>
-
-<!-- ==================================================================== -->
-<!-- -->
-<!-- B A S E T U R B I N E S C H E M A -->
-<!-- -->
-<!-- ==================================================================== -->
-<!-- This is the the XML schema used by Torque to generate the necessary -->
-<!-- sources used to create/initialize the base Turbine system. Torque -->
-<!-- will create the SQL for the database required by Turbine, and the -->
-<!-- Peer-based Object Model used by Turbine internally to manage -->
-<!-- users and security. -->
-<!-- ==================================================================== -->
-<!-- @author: <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a> -->
-<!-- @version $Id: turbine-schema.xml,v 1.2 2001/11/13 05:35:43 jmcnally Exp $ -->
-<!-- ==================================================================== -->
-
-<database name="@DATABASE_DEFAULT@">
-
- <table name="TURBINE_PERMISSION" idMethod="idbroker">
- <column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="PERMISSION_NAME" required="true" size="99" type="VARCHAR"
javaName="Name"/>
-
- <unique>
- <unique-column name="PERMISSION_NAME"/>
- </unique>
-
- </table>
-
- <table name="TURBINE_ROLE" idMethod="idbroker">
- <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="ROLE_NAME" required="true" size="99" type="VARCHAR"
javaName="Name"/>
-
- <unique>
- <unique-column name="ROLE_NAME"/>
- </unique>
-
- </table>
-
- <table name="TURBINE_GROUP" idMethod="idbroker">
- <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="GROUP_NAME" required="true" type="VARCHAR" size="99"
javaName="Name"/>
-
- <unique>
- <unique-column name="GROUP_NAME"/>
- </unique>
-
- </table>
-
- <table name="TURBINE_ROLE_PERMISSION">
- <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="PERMISSION_ID" required="true" primaryKey="true" type="INTEGER"/>
-
- <foreign-key foreignTable="TURBINE_ROLE">
- <reference local="ROLE_ID" foreign="ROLE_ID"/>
- </foreign-key>
-
- <foreign-key foreignTable="TURBINE_PERMISSION">
- <reference local="PERMISSION_ID" foreign="PERMISSION_ID"/>
- </foreign-key>
- </table>
-
- <table name="TURBINE_USER" idMethod="idbroker">
- <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="LOGIN_NAME" required="true" size="32" type="VARCHAR"
javaName="UserName"/>
- <column name="PASSWORD_VALUE" required="true" size="32" type="VARCHAR"
javaName="Password"/>
- <column name="FIRST_NAME" required="true" size="99" type="VARCHAR"/>
- <column name="LAST_NAME" required="true" size="99" type="VARCHAR"/>
- <column name="EMAIL" size="99" type="VARCHAR"/>
- <column name="CONFIRM_VALUE" size="99" type="VARCHAR" javaName="Confirmed"/>
- <column name="MODIFIED" type="TIMESTAMP"/>
- <column name="CREATED" type="TIMESTAMP" javaName="CreateDate"/>
- <column name="LAST_LOGIN" type="TIMESTAMP"/>
- <column name="OBJECTDATA" type="VARBINARY"/>
- @EXTRA_USER_COLUMNS@
- <unique>
- <unique-column name="LOGIN_NAME"/>
- </unique>
-
- </table>
-
- <table name="TURBINE_USER_GROUP_ROLE">
- <column name="USER_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="GROUP_ID" required="true" primaryKey="true" type="INTEGER"/>
- <column name="ROLE_ID" required="true" primaryKey="true" type="INTEGER"/>
-
- <foreign-key foreignTable="TURBINE_USER">
- <reference local="USER_ID" foreign="USER_ID"/>
- </foreign-key>
-
- <foreign-key foreignTable="TURBINE_GROUP">
- <reference local="GROUP_ID" foreign="GROUP_ID"/>
- </foreign-key>
-
- <foreign-key foreignTable="TURBINE_ROLE">
- <reference local="ROLE_ID" foreign="ROLE_ID"/>
- </foreign-key>
- </table>
-
-</database>
Index: src/java/org/apache/fulcrum/FulcrumContainer.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/FulcrumContainer.java,v
retrieving revision 1.1
diff -u -r1.1 FulcrumContainer.java
--- src/java/org/apache/fulcrum/FulcrumContainer.java 4 Nov 2002 05:36:47 -0000
1.1
+++ src/java/org/apache/fulcrum/FulcrumContainer.java 26 Dec 2002 06:21:21 -0000
@@ -73,7 +73,6 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.log.Hierarchy;
public class FulcrumContainer
Index: src/java/org/apache/fulcrum/db/TurbineDatabaseService.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/db/TurbineDatabaseService.java,v
retrieving revision 1.3
diff -u -r1.3 TurbineDatabaseService.java
--- src/java/org/apache/fulcrum/db/TurbineDatabaseService.java 31 Jul 2002 20:37:00
-0000 1.3
+++ src/java/org/apache/fulcrum/db/TurbineDatabaseService.java 26 Dec 2002 06:21:22
+-0000
@@ -233,6 +233,6 @@
public String getDefaultMap()
{
- return Torque.getDefaultMap();
+ return Torque.getDefaultDB();
}
}
Index: src/java/org/apache/fulcrum/schedule/JobEntry.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/schedule/JobEntry.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 JobEntry.java
--- src/java/org/apache/fulcrum/schedule/JobEntry.java 30 May 2002 02:27:27 -0000
1.1.1.1
+++ src/java/org/apache/fulcrum/schedule/JobEntry.java 26 Dec 2002 06:21:22 -0000
@@ -155,9 +155,8 @@
int result = -1;
if (je instanceof JobEntry)
{
- result = getJobId().getBigDecimal()
- .compareTo(
- ((JobEntry)je).getJobId().getBigDecimal());
+ if( getJobId() == ((JobEntry)je).getJobId() )
+ result = 1;
}
return result;
}
Index: src/java/org/apache/fulcrum/template/TemplateEmail.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/java/org/apache/fulcrum/template/TemplateEmail.java,v
retrieving revision 1.4
diff -u -r1.4 TemplateEmail.java
--- src/java/org/apache/fulcrum/template/TemplateEmail.java 17 Sep 2002 22:44:10
-0000 1.4
+++ src/java/org/apache/fulcrum/template/TemplateEmail.java 26 Dec 2002 06:21:22
+-0000
@@ -60,8 +60,7 @@
import java.io.StringWriter;
import javax.mail.internet.InternetAddress;
import org.apache.commons.mail.SimpleEmail;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.util.WordWrapper;
+import org.apache.commons.util.WordWrapUtils;
/**
* This is a simple class for sending email from within the TemplateService.
@@ -460,7 +459,7 @@
// If the caller desires word-wrapping, do it here
if (wordWrap > 0)
{
- body = WordWrapper.wrapText (body,
+ body = WordWrapUtils.wrapText (body,
System.getProperty("line.separator"),
wordWrap);
}
Index: src/test/org/apache/fulcrum/crypto/CryptoDefaultTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/crypto/CryptoDefaultTest.java,v
retrieving revision 1.2
diff -u -r1.2 CryptoDefaultTest.java
--- src/test/org/apache/fulcrum/crypto/CryptoDefaultTest.java 4 Nov 2002 05:36:49
-0000 1.2
+++ src/test/org/apache/fulcrum/crypto/CryptoDefaultTest.java 26 Dec 2002 06:21:21
+-0000
@@ -58,9 +58,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.fulcrum.factory.FactoryService;
-import org.apache.fulcrum.factory.TurbineFactoryService;
-
import org.apache.fulcrum.FulcrumContainer;
import org.apache.avalon.framework.context.DefaultContext;
@@ -76,8 +73,8 @@
FulcrumContainer fulcrum = new FulcrumContainer();
DefaultContext ctx = new DefaultContext();
- ctx.put(fulcrum.APP_ROOT, ".");
- ctx.put(fulcrum.CONF_XML,
+ ctx.put(FulcrumContainer.APP_ROOT, ".");
+ ctx.put(FulcrumContainer.CONF_XML,
"<fulcrum-services><crypto/><factory/></fulcrum-services>");
fulcrum.contextualize(ctx);
Index: src/test/org/apache/fulcrum/crypto/CryptoTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/crypto/CryptoTest.java,v
retrieving revision 1.2
diff -u -r1.2 CryptoTest.java
--- src/test/org/apache/fulcrum/crypto/CryptoTest.java 4 Nov 2002 05:36:49 -0000
1.2
+++ src/test/org/apache/fulcrum/crypto/CryptoTest.java 26 Dec 2002 06:21:21 -0000
@@ -58,12 +58,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.commons.configuration.BaseConfiguration;
-import org.apache.commons.configuration.Configuration;
-
-import org.apache.fulcrum.factory.FactoryService;
-import org.apache.fulcrum.factory.TurbineFactoryService;
-
import org.apache.fulcrum.crypto.provider.UnixCrypt;
import org.apache.fulcrum.crypto.provider.ClearCrypt;
import org.apache.fulcrum.crypto.provider.JavaCrypt;
@@ -84,8 +78,8 @@
FulcrumContainer fulcrum = new FulcrumContainer();
DefaultContext ctx = new DefaultContext();
- ctx.put(fulcrum.APP_ROOT, ".");
- ctx.put(fulcrum.CONF_XML,
+ ctx.put(FulcrumContainer.APP_ROOT, ".");
+ ctx.put(FulcrumContainer.CONF_XML,
"<fulcrum-services><crypto><algorithm>" +
"<unix>" + UnixCrypt.class.getName() + "</unix>" +
"<clear>" + ClearCrypt.class.getName() + "</clear>" +
Index: src/test/org/apache/fulcrum/security/AccessControlListTest.java
===================================================================
RCS file:
/home/cvspublic/jakarta-turbine-fulcrum/src/test/org/apache/fulcrum/security/AccessControlListTest.java,v
retrieving revision 1.2
diff -u -r1.2 AccessControlListTest.java
--- src/test/org/apache/fulcrum/security/AccessControlListTest.java 4 Nov 2002
05:36:50 -0000 1.2
+++ src/test/org/apache/fulcrum/security/AccessControlListTest.java 26 Dec 2002
+06:21:21 -0000
@@ -65,18 +65,11 @@
import org.apache.fulcrum.ServiceManager;
import org.apache.fulcrum.TurbineServices;
-import org.apache.fulcrum.factory.FactoryService;
-import org.apache.fulcrum.factory.TurbineFactoryService;
-
import org.apache.fulcrum.security.SecurityService;
-import org.apache.fulcrum.security.entity.Group;
-
import org.apache.fulcrum.security.util.AccessControlList;
import org.apache.fulcrum.security.impl.TurbineAccessControlList;
-import org.apache.fulcrum.security.impl.db.DBSecurityService;
-
import org.apache.fulcrum.FulcrumContainer;
import org.apache.avalon.framework.context.DefaultContext;
@@ -93,7 +86,7 @@
public void testSelection()
{
- try
+ try
{
doit();
}
@@ -120,8 +113,8 @@
FulcrumContainer fulcrum = new FulcrumContainer();
DefaultContext ctx = new DefaultContext();
- ctx.put(fulcrum.APP_ROOT, ".");
- ctx.put(fulcrum.CONF_XML,
+ ctx.put(FulcrumContainer.APP_ROOT, ".");
+ ctx.put(FulcrumContainer.CONF_XML,
"<fulcrum-services><factory/><security
class=\"org.apache.fulcrum.security.impl.db.DBSecurityService\"/></fulcrum-services>");
fulcrum.contextualize(ctx);
fulcrum.initialize();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
