Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ssk...@vh...> - 2005-09-02 10:46:03
|
Author: sskracic
Date: 2005-09-02 12:37:02 +0200 (Fri, 02 Sep 2005)
New Revision: 741
Modified:
ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java
ccm-core/trunk/test/src/com/arsdigita/categorization/AncestorsTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/CategorizedObjectTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTestCase.java
ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/ObjectCategoryMappingTest.java
ccm-core/trunk/test/src/com/arsdigita/categorization/UseContextTest.java
ccm-core/trunk/test/src/com/arsdigita/db/ConnectionManagerTest.java
ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java
ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java
ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java
ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java
ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java
ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java
ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java
ccm-core/trunk/test/src/com/arsdigita/globalization/Charset2Test.java
ccm-core/trunk/test/src/com/arsdigita/globalization/Locale2Test.java
ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java
ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleTest.java
ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java
ccm-core/trunk/test/src/com/arsdigita/kernel/Bug164566Test.java
ccm-core/trunk/test/src/com/arsdigita/kernel/EmailAddressTest.java
ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java
ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java
ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java
Log:
NFC: yet more import tidying up.
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ToggleLinkTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,9 +18,9 @@
*/
package com.arsdigita.bebop;
-import org.apache.log4j.Logger;
import com.arsdigita.util.HttpServletDummyRequest;
import com.arsdigita.util.HttpServletDummyResponse;
+import org.apache.log4j.Logger;
/**
* Regression tests for the ToggleLink component.
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/XMLComponentRegressionBase.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,11 +18,10 @@
*/
package com.arsdigita.bebop;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.RequestEnvironment;
-//import junit.framework.TestCase;
+import java.io.PrintWriter;
+import java.io.StringWriter;
/**
* This test performs regression testing on bebop Component XML
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/AncestorsTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/AncestorsTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/AncestorsTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,13 +18,11 @@
*/
package com.arsdigita.categorization;
-import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.DataQuery;
-
+import com.arsdigita.persistence.SessionManager;
+import java.math.BigDecimal;
import org.apache.log4j.Logger;
-import java.math.BigDecimal;
-
public class AncestorsTest extends CategoryTestCase {
private final static Logger s_log = Logger.getLogger(AncestorsTest.class);
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategorizedObjectTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/CategorizedObjectTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategorizedObjectTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -19,9 +19,7 @@
package com.arsdigita.categorization;
import com.arsdigita.kernel.Group;
-
import java.util.Collection;
-
import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryCategoryMappingTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -23,9 +23,7 @@
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataObject;
-
import java.math.BigDecimal;
-
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -27,9 +27,7 @@
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.util.AssertionError;
-
import java.math.BigDecimal;
-
import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTestCase.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTestCase.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTestCase.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -22,7 +22,6 @@
import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DomainServiceInterfaceExposer;
import com.arsdigita.tools.junit.framework.BaseTestCase;
-
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Collection;
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeModelTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,10 +18,9 @@
*/
package com.arsdigita.categorization;
-import com.arsdigita.persistence.TransactionContext;
-import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.Session;
-
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.TransactionContext;
import junit.framework.TestCase;
// ALL METHODS ARE COMMENTED OUT BECAUSE WE ARE REPLACING THE API
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/CategoryTreeNodeTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,10 +18,9 @@
*/
package com.arsdigita.categorization;
-import com.arsdigita.persistence.TransactionContext;
-import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.Session;
-
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.TransactionContext;
import junit.framework.TestCase;
// ALL METHODS ARE COMMENTED OUT BECAUSE WE ARE REPLACING THE API
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/IsolatedTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -24,7 +24,6 @@
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TestTransaction;
-
import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/ObjectCategoryMappingTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/ObjectCategoryMappingTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/ObjectCategoryMappingTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -23,9 +23,6 @@
import com.arsdigita.kernel.Group;
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
-
-
-
import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/categorization/UseContextTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/categorization/UseContextTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/categorization/UseContextTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -19,10 +19,8 @@
package com.arsdigita.categorization;
import com.arsdigita.kernel.Group;
-
import java.util.HashMap;
import java.util.Map;
-
import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/db/ConnectionManagerTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/db/ConnectionManagerTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/db/ConnectionManagerTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,14 +18,12 @@
*/
package com.arsdigita.db;
-import junit.framework.TestCase;
+import com.arsdigita.persistence.SessionManager;
+import java.sql.SQLException;
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
-import java.sql.SQLException;
-
-import com.arsdigita.persistence.SessionManager;
-
public class ConnectionManagerTest extends TestCase {
public static final String versionId = "$Id$ by $Author$, $DateTime: 2004/08/16 18:10:38 $";
Modified: ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,19 +18,17 @@
*/
package com.arsdigita.db;
-import junit.framework.*;
-import junit.extensions.*;
-
+import com.arsdigita.persistence.DedicatedConnectionSource;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.metadata.MetadataRoot;
+import com.arsdigita.runtime.RuntimeConfig;
import java.io.DataInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.sql.SQLException;
+import junit.extensions.*;
+import junit.framework.*;
-import com.arsdigita.runtime.RuntimeConfig;
-import com.arsdigita.persistence.metadata.MetadataRoot;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.persistence.DedicatedConnectionSource;
-
/**
* This test exists to exercise the database and the sundry JDBC
* methods. It should ultimately be extended to include most or
Modified: ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/db/DBTestSuite.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,17 +18,17 @@
*/
package com.arsdigita.db;
+import com.arsdigita.persistence.DedicatedConnectionSource;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.metadata.MetadataRoot;
+import com.arsdigita.runtime.RuntimeConfig;
import com.arsdigita.tools.junit.extensions.BaseTestSetup;
import com.arsdigita.tools.junit.extensions.CoreTestSetup;
import com.arsdigita.tools.junit.framework.PackageTestSuite;
-import com.arsdigita.runtime.RuntimeConfig;
-import com.arsdigita.persistence.metadata.MetadataRoot;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.persistence.DedicatedConnectionSource;
+import junit.extensions.TestDecorator;
+import junit.framework.Protectable;
import junit.framework.Test;
import junit.framework.TestResult;
-import junit.framework.Protectable;
-import junit.extensions.TestDecorator;
/**
* @author Jon Orris
Modified: ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DBInvariantTestSuite.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,13 +18,13 @@
*/
package com.arsdigita.dbinvariants;
+import com.arsdigita.db.DbHelper;
import com.arsdigita.tools.junit.extensions.BaseTestSetup;
import com.arsdigita.tools.junit.extensions.CoreTestSetup;
import com.arsdigita.tools.junit.framework.PackageTestSuite;
-import com.arsdigita.db.DbHelper;
import junit.framework.Test;
+import junit.framework.TestResult;
import junit.framework.TestSuite;
-import junit.framework.TestResult;
/**
* @author Jon Orris
Modified: ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/dbinvariants/DbInvariantTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,13 +18,10 @@
*/
package com.arsdigita.dbinvariants;
-import com.arsdigita.tools.junit.framework.BaseTestCase;
-
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.SessionManager;
-
+import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.Assert;
-
import java.util.ArrayList;
import java.util.List;
Modified: ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,13 +18,10 @@
*/
package com.arsdigita.developersupport;
-
-import junit.framework.*;
-import junit.extensions.*;
-
import java.sql.SQLException;
-
import java.util.HashMap;
+import junit.extensions.*;
+import junit.framework.*;
/**
*
Modified: ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,24 +18,20 @@
*/
package com.arsdigita.dispatcher;
+import com.arsdigita.dispatcher.BaseDispatcherServlet;
+import com.arsdigita.dispatcher.MultipartHttpServletRequest;
+import com.arsdigita.dispatcher.RedirectException;
+import com.arsdigita.dispatcher.RequestContext;
+import com.arsdigita.dispatcher.RequestEvent;
+import com.arsdigita.dispatcher.RequestListener;
+import java.io.PrintWriter;
import javax.servlet.*;
import javax.servlet.http.*;
-import java.io.PrintWriter;
-
import junit.framework.*;
-
import org.apache.cactus.*;
import org.apache.cactus.util.*;
-
import org.apache.log4j.Logger;
-import com.arsdigita.dispatcher.BaseDispatcherServlet;
-import com.arsdigita.dispatcher.MultipartHttpServletRequest;
-import com.arsdigita.dispatcher.RedirectException;
-import com.arsdigita.dispatcher.RequestContext;
-import com.arsdigita.dispatcher.RequestEvent;
-import com.arsdigita.dispatcher.RequestListener;
-
public class BaseDispatcherServletCactusTest extends ServletTestCase {
public static final String versionId = "$Id$ by $Author$, $DateTime: 2004/08/16 18:10:38 $";
Modified: ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,19 +18,15 @@
*/
package com.arsdigita.dispatcher;
+import com.arsdigita.dispatcher.DispatcherHelper;
+import com.arsdigita.dispatcher.InitialRequestContext;
+import com.arsdigita.dispatcher.RequestContext;
import javax.servlet.*;
import javax.servlet.http.*;
-
import junit.framework.*;
-
import org.apache.cactus.*;
import org.apache.cactus.util.*;
-
-import com.arsdigita.dispatcher.DispatcherHelper;
-import com.arsdigita.dispatcher.InitialRequestContext;
-import com.arsdigita.dispatcher.RequestContext;
-
public class DispatcherHelperCactusTest extends ServletTestCase {
public static final String versionId = "$Id$ by $Author$, $DateTime: 2004/08/16 18:10:38 $";
Modified: ccm-core/trunk/test/src/com/arsdigita/globalization/Charset2Test.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/globalization/Charset2Test.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/globalization/Charset2Test.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,10 +18,10 @@
*/
package com.arsdigita.globalization;
-import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.tools.junit.framework.BaseTestCase;
/**
* More tests for Charset DomainObject
Modified: ccm-core/trunk/test/src/com/arsdigita/globalization/Locale2Test.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/globalization/Locale2Test.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/globalization/Locale2Test.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,11 +18,11 @@
*/
package com.arsdigita.globalization;
-import com.arsdigita.tools.junit.framework.BaseTestCase;
+import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.tools.junit.framework.BaseTestCase;
/**
* More tests for Locale DomainObject
Modified: ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleNegotiatorTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,10 +18,9 @@
*/
package com.arsdigita.globalization;
-import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.dispatcher.TestUtils;
+import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.util.Locale;
import java.util.ResourceBundle;
Modified: ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/globalization/LocaleTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -19,12 +19,12 @@
package com.arsdigita.globalization;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.Filter;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.tools.junit.framework.BaseTestCase;
/**
* <p>
Modified: ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,9 +18,9 @@
*/
package com.arsdigita.initializer;
-import junit.framework.*;
import java.util.ArrayList;
import java.util.List;
+import junit.framework.*;
/**
* ScriptTest
Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/Bug164566Test.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/kernel/Bug164566Test.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/kernel/Bug164566Test.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,9 +18,9 @@
*/
package com.arsdigita.kernel;
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.persistence.OID;
import com.arsdigita.tools.junit.framework.BaseTestCase;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.domain.DataObjectNotFoundException;
/**
* Regression test for <a href='http://developer.arsdigita.com/acs5/sdm/one-ticket?ticket_id=164566'>bug 164566</a>.
Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/EmailAddressTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/kernel/EmailAddressTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/kernel/EmailAddressTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,15 +18,14 @@
*/
package com.arsdigita.kernel;
+import com.arsdigita.db.Sequences;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.kernel.EmailAddress;
import com.arsdigita.kernel.Group;
-import com.arsdigita.db.Sequences;
-import org.apache.log4j.Logger;
-
import com.arsdigita.tools.junit.framework.BaseTestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleForum.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -19,16 +19,15 @@
package com.arsdigita.kernel;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.metadata.ObjectType;
-import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataObject;
-
+import com.arsdigita.persistence.OID;
+import com.arsdigita.persistence.PersistenceException;
+import com.arsdigita.persistence.metadata.ObjectType;
import java.util.ArrayList;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/kernel/ExampleMessage.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -19,16 +19,15 @@
package com.arsdigita.kernel;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.metadata.ObjectType;
-import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataObject;
-
+import com.arsdigita.persistence.OID;
+import com.arsdigita.persistence.PersistenceException;
+import com.arsdigita.persistence.metadata.ObjectType;
import java.util.ArrayList;
-import java.util.List;
import java.util.Iterator;
+import java.util.List;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java 2005-09-02 10:29:31 UTC (rev 740)
+++ ccm-core/trunk/test/src/com/arsdigita/kernel/GroupMembershipTest.java 2005-09-02 10:37:02 UTC (rev 741)
@@ -18,11 +18,10 @@
*/
package com.arsdigita.kernel;
+import com.arsdigita.domain.DomainCollection;
+import com.arsdigita.domain.DomainObject;
import junit.framework.*;
-import com.arsdigita.domain.DomainObject;
-import com.arsdigita.domain.DomainCollection;
-
/**
* Test to illustrate a problem discovered with changing group
* memberships.
|
|
From: <ssk...@vh...> - 2005-09-02 10:38:49
|
Author: sskracic
Date: 2005-09-02 12:29:31 +0200 (Fri, 02 Sep 2005)
New Revision: 740
Modified:
ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java
ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ListTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java
ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java
ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java
ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java
Log:
NFC: yet more import tidying up.
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,30 +18,26 @@
*/
package com.arsdigita.bebop;
-import junit.framework.*;
-
-import org.apache.cactus.*;
-import org.apache.cactus.util.*;
-
-import com.arsdigita.bebop.parameters.NumberParameter;
-import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.form.Submit;
-import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.bebop.event.FormValidationListener;
-
+import com.arsdigita.bebop.form.Submit;
+import com.arsdigita.bebop.form.TextField;
+import com.arsdigita.bebop.parameters.NumberParameter;
+import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.dispatcher.BaseDispatcherServlet;
import com.arsdigita.dispatcher.RedirectException;
import com.arsdigita.dispatcher.RequestContext;
import com.arsdigita.util.URLRewriter;
-
-import javax.servlet.Servlet;
-import javax.servlet.http.*;
import java.util.ArrayList;
import java.util.Collection;
+import javax.servlet.Servlet;
+import javax.servlet.http.*;
+import junit.framework.*;
+import org.apache.cactus.*;
+import org.apache.cactus.util.*;
/**
* Tests various BeBop form processing functionality
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,19 +18,14 @@
*/
package com.arsdigita.bebop;
-import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.event.FormValidationListener;
+import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.IntegerParameter;
-import com.arsdigita.bebop.parameters.IntegerParameter;
-import junit.framework.TestCase;
-import com.arsdigita.bebop.event.FormInitListener;
-import com.arsdigita.bebop.event.FormProcessListener;
-import com.arsdigita.bebop.event.FormSectionEvent;
-import com.arsdigita.bebop.event.FormValidationListener;
import com.arsdigita.util.RequestEnvironment;
+import junit.framework.TestCase;
/**
* @author Uday Mathur
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,9 +18,7 @@
*/
package com.arsdigita.bebop;
-
import com.arsdigita.xml.Element;
-
import java.util.Iterator;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,12 +18,11 @@
*/
package com.arsdigita.bebop;
-import junit.framework.TestCase;
-
-import com.arsdigita.xml.Element;
-import java.util.Iterator;
import com.arsdigita.util.HttpServletDummyRequest;
import com.arsdigita.util.HttpServletDummyResponse;
+import com.arsdigita.xml.Element;
+import java.util.Iterator;
+import junit.framework.TestCase;
/**
* Regression tests for the Component interface.
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,22 +18,20 @@
*/
package com.arsdigita.bebop;
-import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.util.RequestEnvironment;
+import com.arsdigita.globalization.Globalization;
import com.arsdigita.util.HttpServletDummyRequest;
import com.arsdigita.util.HttpServletDummyResponse;
+import com.arsdigita.util.RequestEnvironment;
+import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.xml.Document;
-import com.arsdigita.globalization.Globalization;
-
+import java.io.File;
+import java.io.StringWriter;
import javax.servlet.ServletException;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.*;
import javax.xml.transform.dom.DOMSource;
-import java.io.File;
-import java.io.StringWriter;
-
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
import org.apache.log4j.Logger;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -17,12 +17,13 @@
*
*/
package com.arsdigita.bebop;
+
import com.arsdigita.util.Assert;
+import com.arsdigita.util.HttpServletDummyRequest;
+import com.arsdigita.util.HttpServletDummyResponse;
import com.arsdigita.xml.Document;
import java.util.StringTokenizer;
import javax.servlet.ServletException;
-import com.arsdigita.util.HttpServletDummyRequest;
-import com.arsdigita.util.HttpServletDummyResponse;
/**
* This utility class takes a Bebop Component and generates the XML for
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLComparator.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,6 +18,13 @@
*/
package com.arsdigita.bebop;
+import java.io.CharArrayWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import javax.xml.transform.*;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
import org.apache.log4j.Logger;
import org.custommonkey.xmlunit.DetailedDiff;
import org.custommonkey.xmlunit.Diff;
@@ -27,14 +34,6 @@
import org.jdom.output.XMLOutputter;
import org.w3c.dom.Document;
-import javax.xml.transform.*;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.CharArrayWriter;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
/**
* This class implements base functionality for generating XML from a
* Bebop Component, and comparing that XML to canonical files that
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentXMLRegexper.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -19,20 +19,15 @@
package com.arsdigita.bebop;
import com.arsdigita.util.Assert;
-
-import java.io.IOException;
import java.io.CharArrayWriter;
import java.io.FileOutputStream;
-
+import java.io.IOException;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.transform.*;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
import junit.framework.TestCase;
-
-// for regular expression matching
import org.apache.oro.text.perl.Perl5Util;
-
import org.w3c.dom.Document;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -31,18 +31,10 @@
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.parameters.EnumerationValidationListener;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
-import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
-import com.arsdigita.bebop.parameters.NumberParameter;
-import com.arsdigita.bebop.parameters.ParameterData;
-import com.arsdigita.bebop.parameters.ParameterModel;
-import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
import com.arsdigita.util.HttpServletDummyResponse;
import com.arsdigita.util.RequestEnvironment;
-
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ListTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ListTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ListTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,8 +18,8 @@
*/
package com.arsdigita.bebop;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
/**
* Regression tests for the List component.
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,11 +18,9 @@
*/
package com.arsdigita.bebop;
+import com.arsdigita.bebop.parameters.StringParameter;
import junit.framework.TestCase;
-
-import com.arsdigita.bebop.parameters.StringParameter;
-
/**
* Regression tests for Page.
*
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -24,11 +24,6 @@
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.parameters.ArrayParameter;
-import com.arsdigita.bebop.parameters.NumberParameter;
-import com.arsdigita.bebop.parameters.ParameterData;
-import com.arsdigita.bebop.parameters.ParameterModel;
-import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -20,9 +20,8 @@
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.util.RequestEnvironment;
import com.arsdigita.util.HttpServletDummyRequest;
-
+import com.arsdigita.util.RequestEnvironment;
import java.util.Enumeration;
import java.util.Hashtable;
import javax.servlet.*;
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,10 +18,9 @@
*/
package com.arsdigita.bebop.form;
+import com.arsdigita.bebop.ComponentTestHarness;
import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.event.FormSectionEvent;
-import com.arsdigita.bebop.ComponentTestHarness;
-
import java.util.Calendar;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/Fixture.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -17,9 +17,10 @@
*
*/
package com.arsdigita.bebop.form;
-import com.arsdigita.bebop.Form;
-import com.arsdigita.bebop.Page;
-import com.arsdigita.bebop.XMLComponentRegressionBase;
+
+import com.arsdigita.bebop.Form;
+import com.arsdigita.bebop.Page;
+import com.arsdigita.bebop.XMLComponentRegressionBase;
import com.arsdigita.util.RequestEnvironment;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/SelectTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,14 +18,14 @@
*/
package com.arsdigita.bebop.form;
+import com.arsdigita.bebop.ComponentTestHarness;
import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.ComponentTestHarness;
+import com.arsdigita.bebop.event.ActionEvent;
+import com.arsdigita.bebop.event.ActionListener;
+import com.arsdigita.bebop.event.PrintEvent;
+import com.arsdigita.bebop.event.PrintListener;
import com.arsdigita.util.HttpServletDummyRequest;
import com.arsdigita.util.HttpServletDummyResponse;
-import com.arsdigita.bebop.event.PrintListener;
-import com.arsdigita.bebop.event.PrintEvent;
-import com.arsdigita.bebop.event.ActionListener;
-import com.arsdigita.bebop.event.ActionEvent;
/**
* Regression tests for the text field widget
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,13 +18,13 @@
*/
package com.arsdigita.bebop.form;
-import junit.framework.*;
-import com.arsdigita.xml.Element;
-import com.arsdigita.xml.TagTestElement;
+import com.arsdigita.bebop.ComponentTestHarness;
import com.arsdigita.bebop.List;
import com.arsdigita.bebop.Page;
-import com.arsdigita.bebop.ComponentTestHarness;
import com.arsdigita.tools.junit.framework.BaseTestCase;
+import com.arsdigita.xml.Element;
+import com.arsdigita.xml.TagTestElement;
+import junit.framework.*;
public class TagTest extends BaseTestCase {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,16 +18,12 @@
*/
package com.arsdigita.bebop.jsp;
-// Test Related
-import com.meterware.httpunit.*;
import com.arsdigita.test.HttpUnitTestCase;
+import com.arsdigita.util.StringUtils;
+import com.meterware.httpunit.*;
import junit.framework.*;
-
-// for regular expression matching
import org.apache.oro.text.perl.Perl5Util;
-import com.arsdigita.util.StringUtils;
-
/**
* Affirmative-validation test to sanity-check /bebop-jsp. Note that
* any slight change to the output could cause any one of these tests
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/BebopJSPTestSuite.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,10 +18,9 @@
*/
package com.arsdigita.bebop.jsp;
-// Test Related
-import com.meterware.httpunit.*;
import com.arsdigita.tools.junit.extensions.BaseTestSetup;
import com.arsdigita.tools.junit.framework.PackageTestSuite;
+import com.meterware.httpunit.*;
import junit.framework.*;
public class BebopJSPTestSuite extends PackageTestSuite {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/jsp/RedirectRaceTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,12 +18,9 @@
*/
package com.arsdigita.bebop.jsp;
-// Test Related
-import com.meterware.httpunit.*;
import com.arsdigita.test.HttpUnitTestCase;
+import com.meterware.httpunit.*;
import junit.framework.*;
-
-// for regular expression matching
import org.apache.oro.text.perl.Perl5Util;
/**
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,20 +18,19 @@
*/
package com.arsdigita.bebop.parameters;
-import java.util.Arrays;
-import java.util.Iterator;
-
+import com.arsdigita.bebop.FormData;
+import com.arsdigita.bebop.FormModel;
+import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.parameters.ArrayParameter;
import com.arsdigita.bebop.parameters.IntegerParameter;
import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.ParameterModel;
-import com.arsdigita.bebop.FormData;
-import com.arsdigita.bebop.FormModel;
-import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
+import java.util.Arrays;
+import java.util.Iterator;
public class ArrayParameterTest extends BaseTestCase {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -23,7 +23,6 @@
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.lang.IllegalArgumentException;
import java.math.BigDecimal;
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -22,7 +22,6 @@
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.util.Date;
import java.util.GregorianCalendar;
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -22,7 +22,6 @@
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.lang.IllegalArgumentException;
public class EmailParameterTest extends BaseTestCase {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,9 +18,9 @@
*/
package com.arsdigita.bebop.parameters;
+import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.parameters.EnumerationValidationListener;
import com.arsdigita.bebop.parameters.ParameterData;
-import com.arsdigita.bebop.FormProcessException;
public class EnumerationValidationListenerTest
extends ValidationListenerTest {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -23,7 +23,6 @@
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.lang.IllegalArgumentException;
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -23,7 +23,6 @@
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.lang.IllegalArgumentException;
public class NumberParameterTest extends BaseTestCase {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,9 +18,9 @@
*/
package com.arsdigita.bebop.parameters;
+import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
import com.arsdigita.bebop.parameters.ParameterData;
-import com.arsdigita.bebop.FormProcessException;
public class NumberValidationListenerTest
extends ValidationListenerTest {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -22,7 +22,6 @@
import com.arsdigita.bebop.parameters.URLParameter;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
-
import java.lang.IllegalArgumentException;
public class URLParameterTest extends BaseTestCase {
Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java 2005-09-02 10:21:19 UTC (rev 739)
+++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java 2005-09-02 10:29:31 UTC (rev 740)
@@ -18,13 +18,13 @@
*/
package com.arsdigita.bebop.parameters;
+import com.arsdigita.bebop.FormData;
+import com.arsdigita.bebop.FormModel;
+import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.event.ParameterListener;
import com.arsdigita.bebop.parameters.NumberParameter;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
-import com.arsdigita.bebop.event.ParameterListener;
-import com.arsdigita.bebop.FormData;
-import com.arsdigita.bebop.FormModel;
-import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.tools.junit.framework.BaseTestCase;
import com.arsdigita.util.HttpServletDummyRequest;
import com.arsdigita.util.RequestEnvironment;
|
Author: sskracic Date: 2005-09-02 12:21:19 +0200 (Fri, 02 Sep 2005) New Revision: 739 Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/form/OptionTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java ccm-core/trunk/test/src/com/arsdigita/domain/DeleteCheckTest.java ccm-core/trunk/test/src/com/arsdigita/domain/DependencyTest.java ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java ccm-core/trunk/test/src/com/arsdigita/domain/JavaClass.java ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackage.java ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackageInstantiator.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentLabelTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentMultipleSelectTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentOptionTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentRadioGroupTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSingleSelectTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentSubmitTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextAreaTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentTextFieldTest.java ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/XMLComparator.java ccm-core/trunk/test/src/com/arsdigita/initializer/FooInitializer.java ccm-core/trunk/test/src/com/arsdigita/initializer/ScriptTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/EmailAddressTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/GroupTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/PackageTypeTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/RolePermissionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/URLServiceTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserAuthenticationTestNew.java ccm-core/trunk/test/src/com/arsdigita/kernel/UserTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/examples/URLServiceExample.pdl ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/OrderingTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/permissions/PermissionTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/CredentialTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/CryptoTest.java ccm-core/trunk/test/src/com/arsdigita/kernel/security/LoginConfigTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailQueueTest.java ccm-core/trunk/test/src/com/arsdigita/mail/MailTest.java ccm-core/trunk/test/src/com/arsdigita/metadata/PersistenceTestCase.java ccm-core/trunk/test/src/com/arsdigita/mimetypes/ConvertHTMLTest.java ccm-core/trunk/test/src/com/arsdigita/notification/DigestQueueManagerTest.java ccm-core/trunk/test/src/com/arsdigita/notification/RequestManagerTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/AggressiveConnectionCloseTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataAssociationCursorTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionImplTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataCollectionTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataObjectManipulator.java ccm-core/trunk/test/src/com/arsdigita/persistence/DataOperationTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DatatypeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DeletionTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/DynamicLinkAttributeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/ExtendLobTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/GenericDataQueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/KeyGenerator.java ccm-core/trunk/test/src/com/arsdigita/persistence/LazyLoadFailureTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/LinkTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/LobTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/Log4jBasedTestCase.java ccm-core/trunk/test/src/com/arsdigita/persistence/MetadataDebuggingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/MultiThreadDataObjectTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/NodeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/ObserverTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/OrderAssociation.java ccm-core/trunk/test/src/com/arsdigita/persistence/PartyTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PooledConnectionSourceTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/PropertyManipulator.java ccm-core/trunk/test/src/com/arsdigita/persistence/RefetchTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StatementClosingTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticLinkAttributeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticNodeTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/StaticPartyTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/metadata/ConstraintTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/oql/QueryTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/AssociationMetadataTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/pdl/PDLTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTest.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/CRUDTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DataSource.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/DoubleUpdateTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/ObjectTree.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/PropertyIsolationTestlet.java ccm-core/trunk/test/src/com/arsdigita/persistence/tests/data/Testlet.java ccm-core/trunk/test/src/com/arsdigita/runtime/StartupTest.java ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchIndexHelpTest.java ccm-core/trunk/test/src/com/arsdigita/search/lucene/LuceneTest.java ccm-core/trunk/test/src/com/arsdigita/search/lucene/Note.java ccm-core/trunk/test/src/com/arsdigita/sitenode/PackageDispatcherCreationCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/PersistenceCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeDispatcherCactusTest.java ccm-core/trunk/test/src/com/arsdigita/sitenode/SiteNodeSuite.java ccm-core/trunk/test/src/com/arsdigita/test/HttpUnitTestCase.java ccm-core/trunk/test/src/com/arsdigita/test/ddl/DDLDiffTest.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/BaseTestSetup.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreInitializer.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PerformanceTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/PermissionDecorator.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/RecordTestSuite.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/framework/PackageTestSuite.java ccm-core/trunk/test/src/com/arsdigita/util/DummyRequestContext.java ccm-core/trunk/test/src/com/arsdigita/util/DummyServletContext.java ccm-core/trunk/test/src/com/arsdigita/util/HttpServletDummyRequest.java ccm-core/trunk/test/src/com/arsdigita/util/OrderedMapTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java ccm-core/trunk/test/src/com/arsdigita/web/ApplicationDispatchTest.java ccm-core/trunk/test/src/com/arsdigita/web/WebConfigExposer.java ccm-core/trunk/test/src/com/arsdigita/web/WebTestCase.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/EngineTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/PersistenceTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/TaskDefinitionTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/TaskTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/UserTaskTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowProcess2Test.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowProcessTest.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowProcessTestHarness.java ccm-core/trunk/test/src/com/arsdigita/workflow/simple/WorkflowTestCase.java ccm-core/trunk/test/src/com/arsdigita/xml/ACSJDOMTest.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/DocImporter.java ccm-core/trunk/test/src/com/arsdigita/xmlutil/PermissionsAction.java Log: NFC: Another pass of tidying up the imports in ccm-core/test. Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingSuite.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,15 +18,15 @@ */ package com.arsdigita.auditing; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.tools.junit.extensions.BaseTestSetup; +import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.extensions.PermissionDecorator; -import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import com.arsdigita.kernel.KernelExcursion; -import com.arsdigita.kernel.Kernel; +import junit.extensions.TestDecorator; import junit.framework.Test; import junit.framework.TestResult; -import junit.extensions.TestDecorator; /** * AuditingSuite Modified: ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/auditing/AuditingTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,17 +18,17 @@ */ package com.arsdigita.auditing; +import com.arsdigita.db.Sequences; import com.arsdigita.domain.DataObjectNotFoundException; - -import com.arsdigita.kernel.*; -import com.arsdigita.persistence.*; -import com.arsdigita.db.Sequences; +import com.arsdigita.kernel.EmailAddress; +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.TransactionContext; import com.arsdigita.tools.junit.framework.BaseTestCase; - -import junit.framework.*; import java.math.BigDecimal; -import java.sql.*; +import java.sql.SQLException; import java.util.Date; +import junit.framework.*; /** * Tests basic functionality of auditing DomainObject Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/BebopFormCactusTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -23,18 +23,25 @@ import org.apache.cactus.*; import org.apache.cactus.util.*; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.event.*; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.bebop.form.Submit; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormSubmissionListener; +import com.arsdigita.bebop.event.FormValidationListener; -import com.arsdigita.dispatcher.*; +import com.arsdigita.dispatcher.BaseDispatcherServlet; +import com.arsdigita.dispatcher.RedirectException; +import com.arsdigita.dispatcher.RequestContext; import com.arsdigita.util.URLRewriter; import javax.servlet.Servlet; import javax.servlet.http.*; -import java.net.HttpURLConnection; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; /** * Tests various BeBop form processing functionality Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/BebopPipelineTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,14 +18,18 @@ */ package com.arsdigita.bebop; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.parameters.*; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormValidationListener; +import com.arsdigita.bebop.parameters.IntegerParameter; +import com.arsdigita.bebop.parameters.IntegerParameter; import junit.framework.TestCase; -import com.arsdigita.bebop.event.*; -import com.arsdigita.util.HttpServletDummyResponse; -import com.arsdigita.util.HttpServletDummyRequest; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormValidationListener; import com.arsdigita.util.RequestEnvironment; /** Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentImpl.java 2005-09-02 10:21:19 UTC (rev 739) @@ -19,7 +19,7 @@ package com.arsdigita.bebop; -import com.arsdigita.xml.*; +import com.arsdigita.xml.Element; import java.util.Iterator; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -20,7 +20,7 @@ import junit.framework.TestCase; -import com.arsdigita.xml.*; +import com.arsdigita.xml.Element; import java.util.Iterator; import com.arsdigita.util.HttpServletDummyRequest; import com.arsdigita.util.HttpServletDummyResponse; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentTestHarness.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,13 +18,10 @@ */ package com.arsdigita.bebop; -import com.arsdigita.util.*; -import com.arsdigita.dispatcher.DispatcherHelper; -import com.arsdigita.dispatcher.InitialRequestContext; -import com.arsdigita.dispatcher.RedirectException; -import com.arsdigita.kernel.security.UserContext; -import com.arsdigita.kernel.security.SessionContext; -import com.arsdigita.kernel.KernelRequestContext; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.RequestEnvironment; +import com.arsdigita.util.HttpServletDummyRequest; +import com.arsdigita.util.HttpServletDummyResponse; import com.arsdigita.xml.Document; import com.arsdigita.globalization.Globalization; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ComponentToXML.java 2005-09-02 10:21:19 UTC (rev 739) @@ -17,10 +17,12 @@ * */ package com.arsdigita.bebop; -import com.arsdigita.util.*; +import com.arsdigita.util.Assert; import com.arsdigita.xml.Document; import java.util.StringTokenizer; import javax.servlet.ServletException; +import com.arsdigita.util.HttpServletDummyRequest; +import com.arsdigita.util.HttpServletDummyResponse; /** * This utility class takes a Bebop Component and generates the XML for Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/FormDataTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,10 +18,26 @@ */ package com.arsdigita.bebop; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.form.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.parameters.*; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormProcessListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.event.FormSubmissionListener; +import com.arsdigita.bebop.event.ParameterListener; +import com.arsdigita.bebop.form.TextField; +import com.arsdigita.bebop.parameters.EnumerationValidationListener; +import com.arsdigita.bebop.parameters.NotNullValidationListener; +import com.arsdigita.bebop.parameters.NumberInRangeValidationListener; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.bebop.parameters.EnumerationValidationListener; +import com.arsdigita.bebop.parameters.NotNullValidationListener; +import com.arsdigita.bebop.parameters.NumberInRangeValidationListener; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; import com.arsdigita.util.HttpServletDummyResponse; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/PageTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -20,8 +20,6 @@ import junit.framework.TestCase; -import com.arsdigita.xml.*; -import java.util.Iterator; import com.arsdigita.bebop.parameters.StringParameter; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/ParameterDataTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,9 +18,17 @@ */ package com.arsdigita.bebop; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.parameters.*; +import com.arsdigita.bebop.event.ParameterListener; +import com.arsdigita.bebop.parameters.ArrayParameter; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.bebop.parameters.ArrayParameter; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.globalization.GlobalizedMessage; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/SessionStateTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,18 +18,13 @@ */ package com.arsdigita.bebop; -import com.arsdigita.bebop.parameters.IntegerParameter; import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.bebop.parameters.StringParameter; -import com.arsdigita.dispatcher.*; -import com.arsdigita.util.*; +import com.arsdigita.util.RequestEnvironment; +import com.arsdigita.util.HttpServletDummyRequest; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.Reader; -import java.net.*; -import java.util.*; +import java.util.Enumeration; +import java.util.Hashtable; import javax.servlet.*; import javax.servlet.http.*; import junit.framework.*; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/DateTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,11 +18,9 @@ */ package com.arsdigita.bebop.form; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.dispatcher.DispatcherHelper; -import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.HttpServletDummyResponse; +import com.arsdigita.bebop.event.FormInitListener; +import com.arsdigita.bebop.event.FormSectionEvent; +import com.arsdigita.bebop.ComponentTestHarness; import java.util.Calendar; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/OptionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/form/OptionTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/OptionTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,7 +18,6 @@ */ package com.arsdigita.bebop.form; -import com.arsdigita.bebop.*; import junit.framework.TestCase; public class OptionTest extends TestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/form/TagTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -21,11 +21,10 @@ import junit.framework.*; import com.arsdigita.xml.Element; import com.arsdigita.xml.TagTestElement; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.List; +import com.arsdigita.bebop.Page; +import com.arsdigita.bebop.ComponentTestHarness; import com.arsdigita.tools.junit.framework.BaseTestCase; -import com.arsdigita.util.HttpServletDummyRequest; -import com.arsdigita.util.HttpServletDummyResponse; -import org.apache.log4j.Logger; public class TagTest extends BaseTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ArrayParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -21,9 +21,15 @@ import java.util.Arrays; import java.util.Iterator; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; -import com.arsdigita.bebop.event.*; +import com.arsdigita.bebop.parameters.ArrayParameter; +import com.arsdigita.bebop.parameters.IntegerParameter; +import com.arsdigita.bebop.parameters.NotNullValidationListener; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.FormModel; +import com.arsdigita.bebop.FormProcessException; +import com.arsdigita.bebop.event.ParameterListener; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/BigDecimalParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,9 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.BigDecimalParameter; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/DateParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,8 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.DateParameter; +import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EmailParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,8 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.EmailParameter; +import com.arsdigita.bebop.parameters.ParameterModel; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/EnumerationValidationListenerTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,9 +18,9 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.EnumerationValidationListener; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.FormProcessException; public class EnumerationValidationListenerTest extends ValidationListenerTest { Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/IntegerParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,9 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.IntegerParameter; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,9 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/NumberValidationListenerTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,9 +18,9 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.NumberInRangeValidationListener; +import com.arsdigita.bebop.parameters.ParameterData; +import com.arsdigita.bebop.FormProcessException; public class NumberValidationListenerTest extends ValidationListenerTest { Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/URLParameterTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,8 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.URLParameter; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; Modified: ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/bebop/parameters/ValidationListenerTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,9 +18,13 @@ */ package com.arsdigita.bebop.parameters; -import com.arsdigita.bebop.parameters.*; -import com.arsdigita.bebop.event.*; -import com.arsdigita.bebop.*; +import com.arsdigita.bebop.parameters.NumberParameter; +import com.arsdigita.bebop.parameters.ParameterModel; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.bebop.event.ParameterListener; +import com.arsdigita.bebop.FormData; +import com.arsdigita.bebop.FormModel; +import com.arsdigita.bebop.FormProcessException; import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; import com.arsdigita.util.RequestEnvironment; Modified: ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/db/DBExerciseTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -21,14 +21,15 @@ import junit.framework.*; import junit.extensions.*; -import java.io.*; +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; import java.sql.SQLException; import com.arsdigita.runtime.RuntimeConfig; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.DedicatedConnectionSource; -import com.arsdigita.persistence.Session; /** * This test exists to exercise the database and the sundry JDBC Modified: ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/developersupport/DSTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -22,10 +22,9 @@ import junit.framework.*; import junit.extensions.*; -import java.io.*; import java.sql.SQLException; -import java.util.*; +import java.util.HashMap; /** * Modified: ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/dispatcher/BaseDispatcherServletCactusTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -20,12 +20,6 @@ import javax.servlet.*; import javax.servlet.http.*; -import java.util.*; -import java.net.*; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.Reader; import java.io.PrintWriter; import junit.framework.*; @@ -35,8 +29,12 @@ import org.apache.log4j.Logger; -import com.arsdigita.dispatcher.*; -import com.arsdigita.initializer.*; +import com.arsdigita.dispatcher.BaseDispatcherServlet; +import com.arsdigita.dispatcher.MultipartHttpServletRequest; +import com.arsdigita.dispatcher.RedirectException; +import com.arsdigita.dispatcher.RequestContext; +import com.arsdigita.dispatcher.RequestEvent; +import com.arsdigita.dispatcher.RequestListener; public class BaseDispatcherServletCactusTest extends ServletTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/dispatcher/DispatcherHelperCactusTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -20,22 +20,16 @@ import javax.servlet.*; import javax.servlet.http.*; -import java.util.*; -import java.net.*; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.Reader; import junit.framework.*; import org.apache.cactus.*; import org.apache.cactus.util.*; -import org.apache.log4j.Logger; -import com.arsdigita.dispatcher.*; -import com.arsdigita.initializer.*; +import com.arsdigita.dispatcher.DispatcherHelper; +import com.arsdigita.dispatcher.InitialRequestContext; +import com.arsdigita.dispatcher.RequestContext; public class DispatcherHelperCactusTest extends ServletTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/domain/DeleteCheckTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/DeleteCheckTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/DeleteCheckTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -20,11 +20,9 @@ import com.arsdigita.kernel.ACSObject; import com.arsdigita.persistence.DataObject; - import java.util.HashSet; import java.util.Iterator; import java.util.Set; - import org.apache.log4j.Logger; public class DeleteCheckTest extends DomainTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/domain/DependencyTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/DependencyTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/DependencyTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,8 +18,9 @@ */ package com.arsdigita.domain; -import com.arsdigita.persistence.*; -import java.util.*; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; import java.math.BigDecimal; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/DomainObjectFactoryTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -17,10 +17,9 @@ * */ package com.arsdigita.domain; + import com.arsdigita.persistence.DataObject; -import com.arsdigita.persistence.*; import junit.framework.*; -import java.util.*; public class DomainObjectFactoryTest extends DomainTestCase { Modified: ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/DomainTestCase.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,12 +18,12 @@ */ package com.arsdigita.domain; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.pdl.*; -import junit.framework.*; - +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.pdl.PDL; import java.util.HashSet; import java.util.Set; +import junit.framework.*; /** * DomainTestCase: Provides a framework for domain test cases requiring the Modified: ccm-core/trunk/test/src/com/arsdigita/domain/JavaClass.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/JavaClass.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/JavaClass.java 2005-09-02 10:21:19 UTC (rev 739) @@ -17,10 +17,10 @@ * */ package com.arsdigita.domain; + import com.arsdigita.persistence.DataObject; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.metadata.ObjectType; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackage.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackage.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackage.java 2005-09-02 10:21:19 UTC (rev 739) @@ -17,13 +17,13 @@ * */ package com.arsdigita.domain; + +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.OID; import com.arsdigita.persistence.metadata.ObjectType; -import com.arsdigita.persistence.OID; -import com.arsdigita.persistence.DataCollection; -import com.arsdigita.persistence.DataAssociation; -import com.arsdigita.persistence.DataQuery; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackageInstantiator.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackageInstantiator.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/domain/JavaPackageInstantiator.java 2005-09-02 10:21:19 UTC (rev 739) @@ -17,6 +17,7 @@ * */ package com.arsdigita.domain; + import com.arsdigita.persistence.DataObject; public class JavaPackageInstantiator extends DomainObjectInstantiator Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/ComponentPropertiesFormTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,25 +18,13 @@ */ package com.arsdigita.formbuilder.test; - -// Testing remove: -import com.arsdigita.formbuilder.PersistentTextArea; - -// Reference import com.arsdigita.bebop.Form; - -// logging -import org.apache.log4j.Logger; - -// Used to instantiate objects +import com.arsdigita.formbuilder.PersistentTextArea; import com.arsdigita.formbuilder.util.FormBuilderUtil; - +import com.arsdigita.util.UncheckedWrapperException; import java.lang.reflect.Method; +import org.apache.log4j.Logger; -// When we catch exceptions that we cannot deal with -import com.arsdigita.util.UncheckedWrapperException; - - /** * Test case for the ComponentPropertiesForm class. * Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/FormbuilderSuite.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,18 +18,12 @@ */ package com.arsdigita.formbuilder.test; -// The class that we are overriding -import com.arsdigita.tools.junit.framework.PackageTestSuite; - -// The class that we register the initializer with import com.arsdigita.tools.junit.extensions.BaseTestSetup; -import com.arsdigita.tools.junit.extensions.PermissionDecorator; import com.arsdigita.tools.junit.extensions.CoreTestSetup; - -// To contain all tests of the package +import com.arsdigita.tools.junit.extensions.PermissionDecorator; +import com.arsdigita.tools.junit.framework.PackageTestSuite; import junit.framework.Test; - /** * This class is responsible for adding all Form Builder unit tests * to a test suite so that they can all be run. The class also makes Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentCheckboxGroupTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,25 +18,14 @@ */ package com.arsdigita.formbuilder.test; - -// The class we are testing here -import com.arsdigita.formbuilder.PersistentCheckboxGroup; - -// For adding options -import com.arsdigita.formbuilder.PersistentOption; - -// Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; - -// Reference import com.arsdigita.bebop.form.CheckboxGroup; import com.arsdigita.bebop.form.Option; - -// logging +import com.arsdigita.formbuilder.PersistentCheckboxGroup; +import com.arsdigita.formbuilder.PersistentComponent; +import com.arsdigita.formbuilder.PersistentOption; import org.apache.log4j.Logger; - /** * Test the PersistentCheckboxGroup class with the test pattern defined in * the PersistentComponentTestCase. Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentComponentTestCase.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,35 +18,18 @@ */ package com.arsdigita.formbuilder.test; - -// Standard ACS test case setup -import com.arsdigita.tools.junit.framework.BaseTestCase; +import com.arsdigita.bebop.Component; +import com.arsdigita.bebop.form.Widget; import com.arsdigita.dispatcher.TestUtils; - -// Interface of the class that we are testing import com.arsdigita.formbuilder.PersistentComponent; - -// The interface of the reference class -import com.arsdigita.bebop.Component; - -// Used to instantiate factory object import com.arsdigita.formbuilder.util.FormBuilderUtil; - -import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.tools.junit.framework.BaseTestCase; import com.arsdigita.util.HttpServletDummyRequest; - -// Secondary use-cases are in a Map -import java.util.Map; +import com.arsdigita.util.UncheckedWrapperException; +import java.math.BigDecimal; import java.util.HashMap; import java.util.Iterator; - -// We test default value for Widgets (special case) -import com.arsdigita.bebop.form.Widget; - -// For the id of the factory -import java.math.BigDecimal; - -// logging +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentDateTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,26 +18,14 @@ */ package com.arsdigita.formbuilder.test; - -// The class we are testing -import com.arsdigita.formbuilder.PersistentDate; - -// Interface of the class that we are testing -import com.arsdigita.formbuilder.PersistentComponent; - -// Interfaces used by the base test case import com.arsdigita.bebop.Component; - -// For reference import com.arsdigita.bebop.form.Date; import com.arsdigita.bebop.parameters.DateParameter; - -// logging -import org.apache.log4j.Logger; - -// Secondary use-cases +import com.arsdigita.formbuilder.PersistentComponent; +import com.arsdigita.formbuilder.PersistentDate; import java.util.HashMap; import java.util.Map; +import org.apache.log4j.Logger; /** * Test the PersistentDate class with the test pattern defined in Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormSectionTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,37 +18,21 @@ */ package com.arsdigita.formbuilder.test; - -// The class we are testing here -import com.arsdigita.formbuilder.PersistentFormSection; - -// Interfaces used by the component base test case -import com.arsdigita.formbuilder.PersistentComponent; import com.arsdigita.bebop.Component; - -// Component factories used +import com.arsdigita.bebop.FormSection; +import com.arsdigita.bebop.Label; +import com.arsdigita.bebop.event.FormProcessListener; import com.arsdigita.formbuilder.PersistentComponent; +import com.arsdigita.formbuilder.PersistentFormSection; import com.arsdigita.formbuilder.PersistentLabel; +import com.arsdigita.formbuilder.PersistentProcessListener; import com.arsdigita.formbuilder.PersistentSubmit; import com.arsdigita.formbuilder.PersistentTextArea; import com.arsdigita.formbuilder.PersistentTextField; - -// To instantiate the process listener -import com.arsdigita.bebop.event.FormProcessListener; -import com.arsdigita.formbuilder.PersistentProcessListener; import com.arsdigita.formbuilder.util.FormBuilderUtil; - -// Bebop components used by reference -import com.arsdigita.bebop.Label; - -// Reference -import com.arsdigita.bebop.FormSection; import com.arsdigita.persistence.DataCollection; - import java.util.Collection; import java.util.Iterator; - -// logging import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java =================================================================== --- ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java 2005-09-02 10:13:54 UTC (rev 738) +++ ccm-core/trunk/test/src/com/arsdigita/formbuilder/test/PersistentFormTest.java 2005-09-02 10:21:19 UTC (rev 739) @@ -18,21 +18,12 @@ */ package com.arsdigita.formbuilder.test; - -// The class we are testing here -import com.arsdigita.formbuilder.PersistentForm; - -// Interfaces used by the component base test case .. |
|
From: <ssk...@vh...> - 2005-09-02 10:22:44
|
Author: sskracic Date: 2005-09-02 12:13:54 +0200 (Fri, 02 Sep 2005) New Revision: 738 Modified: ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java Log: NFC: first pass at dropping wildcard import in tests. Modified: ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/ProtoTest.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,18 +18,24 @@ */ package com.redhat.persistence; -import junit.framework.TestCase; -//import com.arsdigita.tools.junit.framework.BaseTestCase; - -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.engine.rdbms.*; -import com.redhat.persistence.pdl.PDL; import com.arsdigita.db.ConnectionManager; import com.arsdigita.db.DbHelper; -import java.util.*; -import java.math.*; -import java.sql.*; -import java.io.*; +import com.redhat.persistence.engine.rdbms.ConnectionSource; +import com.redhat.persistence.engine.rdbms.OracleWriter; +import com.redhat.persistence.engine.rdbms.PostgresWriter; +import com.redhat.persistence.engine.rdbms.RDBMSEngine; +import com.redhat.persistence.engine.rdbms.SQLWriter; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.pdl.PDL; +import java.io.FileReader; +import java.math.BigInteger; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.HashSet; +import junit.framework.TestCase; /** * ProtoTest Modified: ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/SessionSuite.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,12 +18,22 @@ */ package com.redhat.persistence; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.PDL; import com.arsdigita.tools.junit.extensions.BaseTestSetup; import com.arsdigita.tools.junit.extensions.CoreTestSetup; import com.arsdigita.tools.junit.framework.PackageTestSuite; -import java.util.*; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Role; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.pdl.PDL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import junit.framework.Test; import junit.framework.TestResult; import org.apache.log4j.Logger; Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/IdentityAdapter.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,8 +18,9 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.ObjectType; /** * IdentityAdapter Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/MultiSet.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,7 +18,10 @@ */ package com.redhat.persistence.oql; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; /** * MultiSet Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/QuerySuite.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,27 +18,44 @@ */ package com.redhat.persistence.oql; -import com.arsdigita.db.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.runtime.*; -import com.arsdigita.xml.*; -import com.redhat.persistence.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.engine.rdbms.*; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.*; - +import com.arsdigita.db.DbHelper; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.util.Classes; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.jdbc.Connections; +import com.arsdigita.xml.XML; +import com.redhat.persistence.Engine; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.QuerySource; +import com.redhat.persistence.Session; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.engine.rdbms.ConnectionSource; +import com.redhat.persistence.engine.rdbms.PostgresWriter; +import com.redhat.persistence.engine.rdbms.RDBMSEngine; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.pdl.PDL; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; +import java.util.Set; +import junit.extensions.*; +import junit.framework.*; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; -import junit.framework.*; -import junit.extensions.*; - -import java.math.*; -import java.sql.*; -import java.util.*; - /** * QuerySuite * Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/QueryTest.java 2005-09-02 10:13:54 UTC (rev 738) @@ -19,14 +19,19 @@ package com.redhat.persistence.oql; import com.arsdigita.db.DbHelper; -import com.redhat.persistence.metadata.*; - +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Root; +import java.io.StringReader; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import junit.framework.*; - -import java.io.*; -import java.sql.*; -import java.util.*; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java =================================================================== --- ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java 2005-09-02 07:24:02 UTC (rev 737) +++ ccm-core/trunk/test/src/com/redhat/persistence/oql/SelectParser.java 2005-09-02 10:13:54 UTC (rev 738) @@ -18,16 +18,11 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; import com.arsdigita.util.UncheckedWrapperException; -import com.arsdigita.util.Assert; - -import java.util.Arrays; -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLParser; +import com.redhat.persistence.common.SQLToken; import java.io.StringReader; - import org.apache.log4j.Logger; /** |
|
From: <ssk...@vh...> - 2005-09-02 07:32:52
|
Author: sskracic
Date: 2005-09-02 09:24:02 +0200 (Fri, 02 Sep 2005)
New Revision: 737
Modified:
ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java
ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java
Log:
Made tests compile again.
Modified: ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java 2005-09-01 12:36:52 UTC (rev 736)
+++ ccm-core/trunk/test/src/com/arsdigita/search/NoteAdapter.java 2005-09-02 07:24:02 UTC (rev 737)
@@ -59,6 +59,9 @@
Note note = (Note)dobj;
return note.getLastModifiedUser();
}
+ public String getContentSection(DomainObject dobj) {
+ return "";
+ }
public ContentProvider[] getContent(DomainObject dobj,
ContentType type) {
Note note = (Note)dobj;
Modified: ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java
===================================================================
--- ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java 2005-09-01 12:36:52 UTC (rev 736)
+++ ccm-core/trunk/test/src/com/arsdigita/search/intermedia/SearchTestBookH.java 2005-09-02 07:24:02 UTC (rev 737)
@@ -72,6 +72,10 @@
return "SearchTestBookH-DisplayName";
}
+ public String getContentSection() {
+ return "";
+ }
+
/* Register instantiator with DomainObjectFactory, must be called by
initializer */
public static void setupDomainObjectFactory() {
|
Author: sskracic
Date: 2005-09-01 14:36:52 +0200 (Thu, 01 Sep 2005)
New Revision: 736
Modified:
ccm-core/trunk/src/com/arsdigita/bebop/PageDispatcher.java
ccm-core/trunk/src/com/arsdigita/bebop/form/CheckboxGroup.java
ccm-core/trunk/src/com/arsdigita/bebop/form/OptionGroup.java
ccm-core/trunk/src/com/arsdigita/bebop/form/RadioGroup.java
ccm-core/trunk/src/com/arsdigita/bebop/form/Select.java
ccm-core/trunk/src/com/arsdigita/bebop/page/BebopApplicationServlet.java
ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java
ccm-core/trunk/src/com/arsdigita/bebop/parameters/BitSetParameter.java
ccm-core/trunk/src/com/arsdigita/bebop/parameters/ParameterModelWrapper.java
ccm-core/trunk/src/com/arsdigita/caching/CacheTable.java
ccm-core/trunk/src/com/arsdigita/categorization/Category.java
ccm-core/trunk/src/com/arsdigita/categorization/RootCategoryCollection.java
ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade2.java
ccm-core/trunk/src/com/arsdigita/db/ConnectionManager.java
ccm-core/trunk/src/com/arsdigita/db/oracle/OracleSequenceImpl.java
ccm-core/trunk/src/com/arsdigita/db/postgres/PostgresSequenceImpl.java
ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherConfig.java
ccm-core/trunk/src/com/arsdigita/domain/DomainObject.java
ccm-core/trunk/src/com/arsdigita/domain/DomainObjectFactory.java
ccm-core/trunk/src/com/arsdigita/domain/installer/DomainObjectTraversalInitializer.java
ccm-core/trunk/src/com/arsdigita/domain/xml/TraversalHandler.java
ccm-core/trunk/src/com/arsdigita/formbuilder/FormSectionGenerator.java
ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHeading.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentRadioGroup.java
ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java
ccm-core/trunk/src/com/arsdigita/formbuilder/WidgetLabel.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/RemoteServerPostListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewAction.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewSection.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionEditor.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionGroupForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetLabelForm.java
ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java
ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java
ccm-core/trunk/src/com/arsdigita/formbuilder/util/Placeholders.java
ccm-core/trunk/src/com/arsdigita/initializer/Script.java
ccm-core/trunk/src/com/arsdigita/initializer/Startup.java
ccm-core/trunk/src/com/arsdigita/installer/SQLLoader.java
ccm-core/trunk/src/com/arsdigita/kernel/BaseInitializer.java
ccm-core/trunk/src/com/arsdigita/kernel/EmailAddress.java
ccm-core/trunk/src/com/arsdigita/kernel/Initializer.java
ccm-core/trunk/src/com/arsdigita/kernel/Party.java
ccm-core/trunk/src/com/arsdigita/kernel/UserAuthentication.java
ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java
ccm-core/trunk/src/com/arsdigita/kernel/security/Crypto.java
ccm-core/trunk/src/com/arsdigita/kernel/security/SecurityConfig.java
ccm-core/trunk/src/com/arsdigita/mail/MailConfig.java
ccm-core/trunk/src/com/arsdigita/mimetypes/MimeType.java
ccm-core/trunk/src/com/arsdigita/mimetypes/converters/ConvertFormat.java
ccm-core/trunk/src/com/arsdigita/persistence/CompoundFilterImpl.java
ccm-core/trunk/src/com/arsdigita/persistence/DataAssociationCursorImpl.java
ccm-core/trunk/src/com/arsdigita/persistence/DataQueryImpl.java
ccm-core/trunk/src/com/arsdigita/persistence/FilterImpl.java
ccm-core/trunk/src/com/arsdigita/persistence/GenericDataQuery.java
ccm-core/trunk/src/com/arsdigita/persistence/OID.java
ccm-core/trunk/src/com/arsdigita/persistence/Session.java
ccm-core/trunk/src/com/arsdigita/persistence/pdl/DirSource.java
ccm-core/trunk/src/com/arsdigita/persistence/pdl/PDL.java
ccm-core/trunk/src/com/arsdigita/persistence/pdl/ZipSource.java
ccm-core/trunk/src/com/arsdigita/populate/PopulateUsers.java
ccm-core/trunk/src/com/arsdigita/populate/apps/Initializer.java
ccm-core/trunk/src/com/arsdigita/populate/apps/PopulateAppPairCollection.java
ccm-core/trunk/src/com/arsdigita/populate/apps/PopulateApps.java
ccm-core/trunk/src/com/arsdigita/populate/portlets/AbstractPopulatePortlet.java
ccm-core/trunk/src/com/arsdigita/populate/portlets/PopulatePortlets.java
ccm-core/trunk/src/com/arsdigita/portal/AgentPortlet.java
ccm-core/trunk/src/com/arsdigita/portal/Initializer.java
ccm-core/trunk/src/com/arsdigita/profiler/Profiler.java
ccm-core/trunk/src/com/arsdigita/runtime/OptionalLegacyInitializer.java
ccm-core/trunk/src/com/arsdigita/runtime/RuntimeClassLoader.java
ccm-core/trunk/src/com/arsdigita/runtime/Startup.java
ccm-core/trunk/src/com/arsdigita/search/CachedResultSet.java
ccm-core/trunk/src/com/arsdigita/search/ContentProvider.java
ccm-core/trunk/src/com/arsdigita/search/Document.java
ccm-core/trunk/src/com/arsdigita/search/MetadataProvider.java
ccm-core/trunk/src/com/arsdigita/search/ResultCache.java
ccm-core/trunk/src/com/arsdigita/search/Search.java
ccm-core/trunk/src/com/arsdigita/search/SearchConfig.java
ccm-core/trunk/src/com/arsdigita/search/SearchSpecification.java
ccm-core/trunk/src/com/arsdigita/search/SearchTransactionListener.java
ccm-core/trunk/src/com/arsdigita/search/SearchableACSObject.java
ccm-core/trunk/src/com/arsdigita/search/converter/BaseConverter.java
ccm-core/trunk/src/com/arsdigita/search/converter/ConversionException.java
ccm-core/trunk/src/com/arsdigita/search/converter/TextConverter.java
ccm-core/trunk/src/com/arsdigita/search/converter/WordConverter.java
ccm-core/trunk/src/com/arsdigita/search/filters/ContentSectionFilterSpecification.java
ccm-core/trunk/src/com/arsdigita/search/filters/DateRangeFilterSpecification.java
ccm-core/trunk/src/com/arsdigita/search/filters/PartyFilterSpecification.java
ccm-core/trunk/src/com/arsdigita/search/intermedia/BaseQueryEngine.java
ccm-core/trunk/src/com/arsdigita/search/intermedia/DataQueryResultSet.java
ccm-core/trunk/src/com/arsdigita/search/intermedia/DocumentObserver.java
ccm-core/trunk/src/com/arsdigita/search/intermedia/SearchableObserver.java
ccm-core/trunk/src/com/arsdigita/search/intermedia/SimpleSearchSpecification.java
ccm-core/trunk/src/com/arsdigita/search/intermedia/TimerFinished.java
ccm-core/trunk/src/com/arsdigita/search/lucene/BaseQueryEngine.java
ccm-core/trunk/src/com/arsdigita/search/lucene/DocumentObserver.java
ccm-core/trunk/src/com/arsdigita/search/lucene/Index.java
ccm-core/trunk/src/com/arsdigita/search/lucene/IndexId.java
ccm-core/trunk/src/com/arsdigita/search/lucene/Indexer.java
ccm-core/trunk/src/com/arsdigita/search/lucene/Initializer.java
ccm-core/trunk/src/com/arsdigita/search/lucene/LuceneResultSet.java
ccm-core/trunk/src/com/arsdigita/search/ui/BaseQueryComponent.java
ccm-core/trunk/src/com/arsdigita/search/ui/FilterWidget.java
ccm-core/trunk/src/com/arsdigita/templating/ApplicationOIDPatternGenerator.java
ccm-core/trunk/src/com/arsdigita/templating/ApplicationPatternGenerator.java
ccm-core/trunk/src/com/arsdigita/templating/PatternStylesheetResolver.java
ccm-core/trunk/src/com/arsdigita/templating/PresentationManager.java
ccm-core/trunk/src/com/arsdigita/templating/URLPatternGenerator.java
ccm-core/trunk/src/com/arsdigita/toolbox/ui/ApplicationAuthenticationListener.java
ccm-core/trunk/src/com/arsdigita/ui/SimplePage.java
ccm-core/trunk/src/com/arsdigita/ui/SimplePageLayout.java
ccm-core/trunk/src/com/arsdigita/ui/login/RecoverPasswordPanel.java
ccm-core/trunk/src/com/arsdigita/ui/login/SubsiteDispatcher.java
ccm-core/trunk/src/com/arsdigita/ui/login/UserEditForm.java
ccm-core/trunk/src/com/arsdigita/ui/login/UserNewForm.java
ccm-core/trunk/src/com/arsdigita/util/ConcurrentDict.java
ccm-core/trunk/src/com/arsdigita/util/Files.java
ccm-core/trunk/src/com/arsdigita/util/Graphs.java
ccm-core/trunk/src/com/arsdigita/util/Tracer.java
ccm-core/trunk/src/com/arsdigita/util/parameter/SingletonParameter.java
ccm-core/trunk/src/com/arsdigita/util/servlet/HttpParameterMap.java
ccm-core/trunk/src/com/arsdigita/util/url/URLData.java
ccm-core/trunk/src/com/arsdigita/util/url/URLPool.java
ccm-core/trunk/src/com/arsdigita/util/xml/SAXParser.java
ccm-core/trunk/src/com/arsdigita/util/xml/XMLConfig.java
ccm-core/trunk/src/com/arsdigita/versioning/DiffState.java
ccm-core/trunk/src/com/arsdigita/versioning/ObjectTypeMetadata.java
ccm-core/trunk/src/com/arsdigita/versioning/QueueMap.java
ccm-core/trunk/src/com/arsdigita/versioning/VersioningServlet.java
ccm-core/trunk/src/com/arsdigita/versioning/Versions.java
ccm-core/trunk/src/com/arsdigita/web/ApplicationFileResolver.java
ccm-core/trunk/src/com/arsdigita/web/ApplicationTool.java
ccm-core/trunk/src/com/arsdigita/web/BaseFilter.java
ccm-core/trunk/src/com/arsdigita/web/BaseServlet.java
ccm-core/trunk/src/com/arsdigita/web/DefaultApplicationFileResolver.java
ccm-core/trunk/src/com/arsdigita/web/DispatcherServlet.java
ccm-core/trunk/src/com/arsdigita/web/HostLoader.java
ccm-core/trunk/src/com/arsdigita/web/ResourceServlet.java
ccm-core/trunk/src/com/arsdigita/web/Web.java
ccm-core/trunk/src/com/arsdigita/web/WebApp.java
ccm-core/trunk/src/com/arsdigita/webdevsupport/Dispatcher.java
ccm-core/trunk/src/com/arsdigita/webdevsupport/Initializer.java
ccm-core/trunk/src/com/arsdigita/webdevsupport/QueryLog.java
ccm-core/trunk/src/com/arsdigita/webdevsupport/config/ConfigList.java
ccm-core/trunk/src/com/arsdigita/xml/XML.java
ccm-core/trunk/src/com/redhat/persistence/DataSet.java
ccm-core/trunk/src/com/redhat/persistence/LoopException.java
ccm-core/trunk/src/com/redhat/persistence/Signature.java
ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/OracleWriter.java
ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/RDBMSEngine.java
ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/RDBMSRecordSet.java
ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/Select.java
ccm-core/trunk/src/com/redhat/persistence/metadata/Mist.java
ccm-core/trunk/src/com/redhat/persistence/metadata/ObjectType.java
Log:
NFC: dropping unused imports in ccm-core/src.
Modified: ccm-core/trunk/src/com/arsdigita/bebop/PageDispatcher.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/PageDispatcher.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/PageDispatcher.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,17 +18,7 @@
*/
package com.arsdigita.bebop;
-import com.arsdigita.developersupport.DeveloperSupport;
-import com.arsdigita.dispatcher.Dispatcher;
-import com.arsdigita.dispatcher.RequestContext;
import com.arsdigita.templating.PresentationManager;
-import com.arsdigita.templating.Templating;
-import com.arsdigita.xml.Document;
-import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.apache.log4j.Logger;
/**
* @deprecated Use {@link com.arsdigita.bebop.page.PageDispatcher}
Modified: ccm-core/trunk/src/com/arsdigita/bebop/form/CheckboxGroup.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/form/CheckboxGroup.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/form/CheckboxGroup.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -20,9 +20,7 @@
-import java.util.Iterator;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.ArrayParameter;
// This interface contains the XML element name of this class
// in a constant which is used when generating XML
Modified: ccm-core/trunk/src/com/arsdigita/bebop/form/OptionGroup.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/form/OptionGroup.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/form/OptionGroup.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,10 +19,8 @@
package com.arsdigita.bebop.form;
import com.arsdigita.bebop.Form;
-import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.bebop.PageState;
-import com.arsdigita.bebop.parameters.ArrayParameter;
import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.ParameterModelWrapper;
Modified: ccm-core/trunk/src/com/arsdigita/bebop/form/RadioGroup.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/form/RadioGroup.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/form/RadioGroup.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,14 +19,12 @@
package com.arsdigita.bebop.form;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
// This interface contains the XML element name of this class
// in a constant which is used when generating XML
import com.arsdigita.bebop.util.BebopConstants;
-import java.util.Iterator;
/**
* A class
Modified: ccm-core/trunk/src/com/arsdigita/bebop/form/Select.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/form/Select.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/form/Select.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,13 +18,11 @@
*/
package com.arsdigita.bebop.form;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.ParameterModel;
// This interface contains the XML element name of this class
// in a constant which is used when generating XML
import com.arsdigita.bebop.util.BebopConstants;
-import java.util.Iterator;
/**
Modified: ccm-core/trunk/src/com/arsdigita/bebop/page/BebopApplicationServlet.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/page/BebopApplicationServlet.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/page/BebopApplicationServlet.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -32,7 +32,6 @@
import java.util.HashMap;
import javax.servlet.ServletException;
-import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/page/PageTransformer.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -50,8 +50,6 @@
import java.util.HashMap;
import java.util.Collection;
import java.util.Map.Entry;
-import java.util.jar.JarEntry;
-import java.util.jar.JarOutputStream;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/BitSetParameter.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/parameters/BitSetParameter.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/parameters/BitSetParameter.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -25,9 +25,6 @@
import java.math.BigInteger;
import java.util.BitSet;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
/**
* Encode and decode a bit set as a request parameter. The bit set is
Modified: ccm-core/trunk/src/com/arsdigita/bebop/parameters/ParameterModelWrapper.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/bebop/parameters/ParameterModelWrapper.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/bebop/parameters/ParameterModelWrapper.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,16 +19,8 @@
package com.arsdigita.bebop.parameters;
import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.event.ParameterEvent;
import com.arsdigita.bebop.event.ParameterListener;
-import com.arsdigita.util.Assert;
-import com.arsdigita.globalization.Globalization;
-import com.arsdigita.util.Lockable;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import org.apache.log4j.Logger;
/**
* A convenience class for implementing a ParameterModel which wraps another
Modified: ccm-core/trunk/src/com/arsdigita/caching/CacheTable.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/caching/CacheTable.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/caching/CacheTable.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -22,19 +22,14 @@
import com.arsdigita.util.StringUtils;
import com.arsdigita.util.parameter.IntegerParameter;
import com.arsdigita.util.parameter.Parameter;
-import com.arsdigita.kernel.SiteNode;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.io.PrintWriter;
-import java.io.StringWriter;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/categorization/Category.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/categorization/Category.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/categorization/Category.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -33,7 +33,6 @@
import com.arsdigita.persistence.DataOperation;
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.persistence.DataQueryDataCollectionAdapter;
-import com.arsdigita.persistence.Filter;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.metadata.ObjectType;
@@ -44,7 +43,6 @@
import java.math.BigDecimal;
import java.sql.SQLException;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
Modified: ccm-core/trunk/src/com/arsdigita/categorization/RootCategoryCollection.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/categorization/RootCategoryCollection.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/categorization/RootCategoryCollection.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -21,8 +21,6 @@
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.ACSObject;
import com.arsdigita.kernel.ACSObjectCollection;
-import com.arsdigita.persistence.DataAssociation;
-import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
Modified: ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade2.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade2.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade2.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,7 +19,6 @@
package com.arsdigita.core;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.initializer.Initializer;
import com.arsdigita.kernel.PackageType;
import com.arsdigita.kernel.SiteNode;
import com.arsdigita.kernel.security.KeyStorage;
Modified: ccm-core/trunk/src/com/arsdigita/db/ConnectionManager.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/db/ConnectionManager.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/db/ConnectionManager.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,7 +18,6 @@
*/
package com.arsdigita.db;
-import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
import java.sql.Connection;
Modified: ccm-core/trunk/src/com/arsdigita/db/oracle/OracleSequenceImpl.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/db/oracle/OracleSequenceImpl.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/db/oracle/OracleSequenceImpl.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,7 +18,6 @@
*/
package com.arsdigita.db.oracle;
-import com.arsdigita.db.ConnectionManager;
import com.arsdigita.db.SequenceImpl;
import java.math.BigDecimal;
Modified: ccm-core/trunk/src/com/arsdigita/db/postgres/PostgresSequenceImpl.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/db/postgres/PostgresSequenceImpl.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/db/postgres/PostgresSequenceImpl.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,7 +18,6 @@
*/
package com.arsdigita.db.postgres;
-import com.arsdigita.db.ConnectionManager;
import com.arsdigita.db.SequenceImpl;
import java.math.BigDecimal;
Modified: ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherConfig.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherConfig.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/dispatcher/DispatcherConfig.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,7 +19,6 @@
package com.arsdigita.dispatcher;
import com.arsdigita.runtime.AbstractConfig;
-import com.arsdigita.templating.PresentationManager;
import com.arsdigita.util.parameter.IntegerParameter;
import com.arsdigita.util.parameter.Parameter;
import com.arsdigita.util.parameter.BooleanParameter;
Modified: ccm-core/trunk/src/com/arsdigita/domain/DomainObject.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/domain/DomainObject.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/domain/DomainObject.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -26,7 +26,6 @@
import com.arsdigita.persistence.Session;
import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.persistence.metadata.MetadataRoot;
import com.arsdigita.persistence.metadata.ObjectType;
import java.io.StringWriter;
Modified: ccm-core/trunk/src/com/arsdigita/domain/DomainObjectFactory.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/domain/DomainObjectFactory.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/domain/DomainObjectFactory.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -27,7 +27,6 @@
import com.arsdigita.persistence.metadata.ObjectType;
import com.arsdigita.persistence.metadata.MetadataRoot;
-import com.arsdigita.util.Assert;
import java.util.Map;
import java.util.HashMap;
Modified: ccm-core/trunk/src/com/arsdigita/domain/installer/DomainObjectTraversalInitializer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/domain/installer/DomainObjectTraversalInitializer.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/domain/installer/DomainObjectTraversalInitializer.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -28,8 +28,6 @@
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
-import java.util.HashMap;
public class DomainObjectTraversalInitializer
implements com.arsdigita.initializer.Initializer {
Modified: ccm-core/trunk/src/com/arsdigita/domain/xml/TraversalHandler.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/domain/xml/TraversalHandler.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/domain/xml/TraversalHandler.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -26,17 +26,13 @@
import com.arsdigita.domain.SimpleDomainObjectXMLFormatter;
import com.arsdigita.persistence.metadata.ObjectType;
import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.util.ResourceManager;
import com.arsdigita.util.Classes;
-import com.arsdigita.xml.XML;
import com.arsdigita.xml.Formatter;
import org.apache.log4j.Logger;
import org.xml.sax.Attributes;
import org.xml.sax.helpers.DefaultHandler;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.HashMap;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/FormSectionGenerator.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/FormSectionGenerator.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/FormSectionGenerator.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -49,7 +49,6 @@
import com.arsdigita.formbuilder.util.FormBuilderUtil;
// Domain objects get special treatment in that they are saved
-import com.arsdigita.domain.DomainObject;
// ACS 5 uses Log4J for logging
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/HiddenIDGenerator.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,7 +19,6 @@
package com.arsdigita.formbuilder;
import com.arsdigita.bebop.FormData;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.RequestLocal;
import com.arsdigita.db.Sequences;
import com.arsdigita.formbuilder.PersistentHidden;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentCheckboxGroup.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -30,7 +30,6 @@
import com.arsdigita.persistence.metadata.ObjectType;
// Every PersistentComponentFactory can create a Bebop Component
-import com.arsdigita.bebop.Component;
// Thrown if the underlying DataObject with given id cannot be found
import com.arsdigita.domain.DataObjectNotFoundException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -35,7 +35,6 @@
// All PersistentComponentFactories can create a Bebop Component
import com.arsdigita.bebop.Component;
-import com.arsdigita.formbuilder.util.FormBuilderUtil;
// ACS 5 uses Log4J for logging
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentFormSection.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -24,7 +24,6 @@
import com.arsdigita.bebop.Container;
import com.arsdigita.bebop.FormSection;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
@@ -34,7 +33,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Iterator;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHeading.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHeading.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHeading.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -31,7 +31,6 @@
import java.math.BigDecimal;
// The factory creates Bebop Components
-import com.arsdigita.bebop.Label;
// Every PersistentComponentFactory can create a Bebop Component
import com.arsdigita.bebop.Component;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentHorizontalRule.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -21,7 +21,6 @@
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.HorizontalLine;
-import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.ObjectType;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentMultipleSelect.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -30,7 +30,6 @@
import com.arsdigita.persistence.metadata.ObjectType;
// Every PersistentComponentFactory can create a Bebop Component
-import com.arsdigita.bebop.Component;
// Thrown if the underlying DataObject with given id cannot be found
import com.arsdigita.domain.DataObjectNotFoundException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentRadioGroup.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentRadioGroup.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentRadioGroup.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -30,7 +30,6 @@
import com.arsdigita.persistence.metadata.ObjectType;
// Every PersistentComponentFactory can create a Bebop Component
-import com.arsdigita.bebop.Component;
// Thrown if the underlying DataObject with given id cannot be found
import com.arsdigita.domain.DataObjectNotFoundException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/PersistentWidget.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -21,9 +21,7 @@
import com.arsdigita.formbuilder.parameters.PersistentParameterListener;
import com.arsdigita.formbuilder.util.FormBuilderUtil;
-import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.FormData;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.form.Widget;
import com.arsdigita.domain.DataObjectNotFoundException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/WidgetLabel.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/WidgetLabel.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/WidgetLabel.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -20,17 +20,12 @@
import com.arsdigita.formbuilder.PersistentLabel;
import com.arsdigita.formbuilder.PersistentWidget;
-import com.arsdigita.formbuilder.util.FormBuilderUtil;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainServiceInterfaceExposer;
-import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.Session;
-import com.arsdigita.persistence.SessionManager;
import java.math.BigDecimal;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/RemoteServerPostListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/RemoteServerPostListener.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/RemoteServerPostListener.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -32,7 +32,6 @@
import java.math.BigDecimal;
import com.arsdigita.bebop.event.FormProcessListener;
-import com.arsdigita.dispatcher.DispatcherHelper;
import com.arsdigita.util.UncheckedWrapperException;
import java.net.URL;
import java.net.URLConnection;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/SimpleEmailListener.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -26,18 +26,14 @@
import com.arsdigita.formbuilder.PersistentWidget;
import com.arsdigita.formbuilder.WidgetLabel;
import com.arsdigita.formbuilder.util.Placeholders;
-import com.arsdigita.formbuilder.util.FormBuilderConfig;
-import com.arsdigita.formbuilder.util.FormBuilderUtil;
import com.arsdigita.bebop.FormData;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.event.FormProcessListener;
import com.arsdigita.bebop.event.FormSectionEvent;
-import com.arsdigita.bebop.parameters.ParameterData;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.Kernel;
-import com.arsdigita.kernel.PersonName;
import com.arsdigita.kernel.User;
import com.arsdigita.mail.Mail;
import com.arsdigita.persistence.OID;
@@ -45,7 +41,6 @@
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.ObjectType;
import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.web.Web;
import java.math.BigDecimal;
import java.util.Iterator;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -32,7 +32,6 @@
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.User;
import com.arsdigita.mail.Mail;
-import com.arsdigita.web.Web;
import java.math.BigDecimal;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/XMLEmailListener.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -34,8 +34,6 @@
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.mail.Mail;
import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.web.Web;
-import com.arsdigita.xml.XML;
import java.io.StringWriter;
import java.math.BigDecimal;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/BaseAddObserver.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -24,9 +24,6 @@
import com.arsdigita.formbuilder.ComponentAddObserver;
import com.arsdigita.bebop.FormSection;
import com.arsdigita.formbuilder.PersistentComponent;
-import com.arsdigita.formbuilder.PersistentHorizontalRule;
-import com.arsdigita.formbuilder.PersistentSubmit;
-import com.arsdigita.formbuilder.PersistentText;
import com.arsdigita.formbuilder.CompoundComponent;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.ColumnPanel;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/FormBuilderXMLRenderer.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -28,7 +28,6 @@
import com.arsdigita.formbuilder.PersistentComponent;
import com.arsdigita.formbuilder.PersistentDataQuery;
import com.arsdigita.formbuilder.PersistentDate;
-import com.arsdigita.formbuilder.PersistentWidget;
import com.arsdigita.formbuilder.util.AttributeHelper;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.persistence.metadata.Property;
@@ -36,18 +35,14 @@
import com.arsdigita.persistence.DataQuery;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.xml.Element;
-import com.arsdigita.xml.XML;
import java.text.DateFormatSymbols;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.HashMap;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.Locale;
-import java.util.Map;
-import java.util.Stack;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewAction.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewAction.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewAction.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -34,9 +34,6 @@
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.util.UncheckedWrapperException;
import com.arsdigita.bebop.form.Submit;
-import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.event.FormSectionEvent;
-import com.arsdigita.bebop.event.FormInitListener;
import com.arsdigita.bebop.SingleSelectionModel;
import com.arsdigita.bebop.Form;
import com.arsdigita.bebop.Page;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewSection.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewSection.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/NewSection.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -20,7 +20,6 @@
import com.arsdigita.formbuilder.PersistentForm;
import com.arsdigita.formbuilder.PersistentFormSection;
-import com.arsdigita.formbuilder.util.FormBuilderUtil;
import com.arsdigita.formbuilder.util.GlobalizationUtil ;
import com.arsdigita.bebop.BoxPanel;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/EmailFieldForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -37,12 +37,10 @@
import com.arsdigita.bebop.event.FormSectionEvent;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.IntegerParameter;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.ParameterModel;
import com.arsdigita.bebop.parameters.StringParameter;
import java.math.BigDecimal;
-import java.util.Iterator;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionEditor.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionEditor.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionEditor.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -57,7 +57,6 @@
import com.arsdigita.web.RedirectSignal;
import java.math.BigDecimal;
-import java.util.Iterator;
import java.io.IOException;
public abstract class OptionEditor extends FormSection {
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionGroupForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionGroupForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/OptionGroupForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -25,7 +25,6 @@
import com.arsdigita.formbuilder.PersistentOptionGroup;
import com.arsdigita.formbuilder.PersistentWidget;
-import com.arsdigita.bebop.BoxPanel;
import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.FormSection;
@@ -52,7 +51,6 @@
import java.math.BigDecimal;
import java.util.TooManyListenersException;
-import java.util.Iterator;
public abstract class OptionGroupForm extends WidgetLabelForm {
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TemplateEmailForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -46,7 +46,6 @@
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObjectFactory;
-import com.arsdigita.persistence.DataAssociationCursor;
import com.arsdigita.persistence.OID;
import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/TextAreaForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -37,7 +37,6 @@
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.parameters.IntegerParameter;
-import com.arsdigita.bebop.parameters.NotNullValidationListener;
import com.arsdigita.bebop.parameters.NumberInRangeValidationListener;
import com.arsdigita.bebop.parameters.StringParameter;
import com.arsdigita.domain.DataObjectNotFoundException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -53,8 +53,6 @@
import com.arsdigita.xml.Element;
import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.Iterator;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetLabelForm.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetLabelForm.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/ui/editors/WidgetLabelForm.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,7 +18,6 @@
*/
package com.arsdigita.formbuilder.ui.editors;
-import org.apache.log4j.Logger;
import com.arsdigita.formbuilder.WidgetLabel;
import com.arsdigita.bebop.FormData;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderConfig.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,13 +18,9 @@
*/
package com.arsdigita.formbuilder.util;
-import com.arsdigita.bebop.page.PageTransformer;
import com.arsdigita.runtime.AbstractConfig;
-import com.arsdigita.templating.PresentationManager;
-import com.arsdigita.ui.SimplePage;
import com.arsdigita.util.parameter.Parameter;
import com.arsdigita.util.parameter.StringParameter;
-import com.arsdigita.web.URL;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/util/FormBuilderUtil.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -22,30 +22,21 @@
import com.arsdigita.formbuilder.util.GlobalizationUtil ;
import com.arsdigita.bebop.FormSection;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.bebop.Label;
-import com.arsdigita.bebop.Link;
import com.arsdigita.bebop.form.TextField;
import com.arsdigita.bebop.form.TextArea;
import com.arsdigita.bebop.FormData;
-import com.arsdigita.kernel.ACSObject;
import com.arsdigita.formbuilder.PersistentWidget;
import com.arsdigita.formbuilder.parameters.PersistentParameterListener;
-import java.math.BigDecimal;
import java.util.Iterator;
// Classes needed when when retrieving a Component DataObject
-import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.Session;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.web.RedirectSignal;
import com.arsdigita.util.UncheckedWrapperException;
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/util/Placeholders.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/util/Placeholders.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/util/Placeholders.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -30,7 +30,6 @@
import com.arsdigita.formbuilder.PersistentWidget;
import com.arsdigita.bebop.FormData;
-import com.arsdigita.bebop.PageState;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.PersonName;
Modified: ccm-core/trunk/src/com/arsdigita/initializer/Script.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/initializer/Script.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/initializer/Script.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -26,7 +26,6 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
Modified: ccm-core/trunk/src/com/arsdigita/initializer/Startup.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/initializer/Startup.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/initializer/Startup.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -24,7 +24,6 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.Reader;
-import java.util.Collection;
import java.util.Set;
/**
Modified: ccm-core/trunk/src/com/arsdigita/installer/SQLLoader.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/installer/SQLLoader.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/installer/SQLLoader.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,7 +18,6 @@
*/
package com.arsdigita.installer;
-import com.arsdigita.util.Assert;
import com.arsdigita.util.UncheckedWrapperException;
import java.io.IOException;
import java.io.InputStream;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/BaseInitializer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/BaseInitializer.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/BaseInitializer.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,13 +18,10 @@
*/
package com.arsdigita.kernel;
-import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.initializer.Configuration;
import com.arsdigita.initializer.InitializationException;
import com.arsdigita.kernel.permissions.PermissionManager;
import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.SessionManager;
-import com.arsdigita.persistence.TransactionContext;
import java.math.BigDecimal;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/EmailAddress.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/EmailAddress.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/EmailAddress.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -24,7 +24,6 @@
// Support for persitent objects
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.DataObject;
-import com.arsdigita.persistence.PersistenceException;
/**
* Represents an email address. While this class
Modified: ccm-core/trunk/src/com/arsdigita/kernel/Initializer.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/Initializer.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/Initializer.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,27 +18,16 @@
*/
package com.arsdigita.kernel;
-import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.domain.DomainObjectInstantiator;
-import com.arsdigita.domain.GlobalObserverManager;
import com.arsdigita.initializer.Configuration;
-import com.arsdigita.initializer.InitializationException;
import com.arsdigita.kernel.PackageInstance;
-import com.arsdigita.kernel.PackageType;
-import com.arsdigita.kernel.SiteNode;
-import com.arsdigita.kernel.Stylesheet;
-import com.arsdigita.kernel.permissions.PermissionService;
-import com.arsdigita.kernel.permissions.PermissionsObserver;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
-import com.arsdigita.kernel.permissions.UniversalPermissionDescriptor;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.TransactionContext;
-import com.arsdigita.util.Assert;
-import java.util.Locale;
import org.apache.log4j.Logger;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/Party.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/Party.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/Party.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -21,7 +21,6 @@
import com.arsdigita.domain.DataObjectNotFoundException;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.metadata.ObjectType;
-import com.arsdigita.persistence.PersistenceException;
import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.DataAssociation;
import com.arsdigita.persistence.DataAssociationCursor;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/UserAuthentication.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/UserAuthentication.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/UserAuthentication.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -20,7 +20,6 @@
import com.arsdigita.domain.DomainObject;
import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.domain.DomainObjectFactory;
import com.arsdigita.kernel.security.Crypto;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.DataQuery;
@@ -29,7 +28,6 @@
import com.arsdigita.persistence.Filter;
import com.arsdigita.util.UncheckedWrapperException;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.security.MessageDigest;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/permissions/PermissionManager.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -19,7 +19,6 @@
package com.arsdigita.kernel.permissions;
import com.arsdigita.kernel.ACSObject;
-import com.arsdigita.kernel.Group;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelConfig;
import com.arsdigita.kernel.KernelExcursion;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/security/Crypto.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/security/Crypto.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/security/Crypto.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -20,7 +20,6 @@
import com.arsdigita.util.UncheckedWrapperException;
-import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
Modified: ccm-core/trunk/src/com/arsdigita/kernel/security/SecurityConfig.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/kernel/security/SecurityConfig.java 2005-09-01 12:27:29 UTC (rev 735)
+++ ccm-core/trunk/src/com/arsdigita/kernel/security/SecurityConfig.java 2005-09-01 12:36:52 UTC (rev 736)
@@ -18,7 +18,6 @@
*/
package com.arsdigita.kernel.security;
..
|
|
From: <ssk...@vh...> - 2005-09-01 12:36:34
|
Author: sskracic Date: 2005-09-01 14:27:29 +0200 (Thu, 01 Sep 2005) New Revision: 735 Modified: ccm-core/trunk/src/com/redhat/persistence/Session.java ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java ccm-core/trunk/src/com/redhat/persistence/oql/All.java ccm-core/trunk/src/com/redhat/persistence/oql/Code.java ccm-core/trunk/src/com/redhat/persistence/oql/Define.java ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java ccm-core/trunk/src/com/redhat/persistence/oql/Get.java ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java ccm-core/trunk/src/com/redhat/persistence/oql/Main.java ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj ccm-core/trunk/src/com/redhat/persistence/oql/Or.java ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java ccm-core/trunk/src/com/redhat/persistence/oql/Query.java ccm-core/trunk/src/com/redhat/persistence/oql/Static.java ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java Log: NFC: getting rid of remaining wildcard imports in ccm-core/src. Modified: ccm-core/trunk/src/com/redhat/persistence/Session.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/Session.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/Session.java 2005-09-01 12:27:29 UTC (rev 735) @@ -28,9 +28,17 @@ import com.redhat.persistence.metadata.Property; import com.redhat.persistence.metadata.Role; import com.redhat.persistence.metadata.Root; -import com.redhat.persistence.oql.*; +import com.redhat.persistence.oql.All; +import com.redhat.persistence.oql.And; +import com.redhat.persistence.oql.Define; +import com.redhat.persistence.oql.Equals; +import com.redhat.persistence.oql.Exists; import com.redhat.persistence.oql.Expression; -import com.redhat.persistence.oql.Query; +import com.redhat.persistence.oql.Filter; +import com.redhat.persistence.oql.Get; +import com.redhat.persistence.oql.Join; +import com.redhat.persistence.oql.Literal; +import com.redhat.persistence.oql.Variable; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; Modified: ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/common/SQLParser.jj 2005-09-01 12:27:29 UTC (rev 735) @@ -8,8 +8,9 @@ package com.redhat.persistence.common; -import java.util.*; -import java.io.*; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; /** * SQLParser @@ -42,11 +43,11 @@ m_mapper = mapper; } - public void initialize(java.io.Reader reader) { + public void initialize(Reader reader) { initialize(reader, m_mapper); } - public void initialize(java.io.Reader reader, Mapper mapper) { + public void initialize(Reader reader, Mapper mapper) { m_assigns.clear(); m_mapper = mapper; m_sql = new SQL(); Modified: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/EventSwitch.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,33 @@ */ package com.redhat.persistence.engine.rdbms; -import com.redhat.persistence.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.AddEvent; +import com.redhat.persistence.Condition; +import com.redhat.persistence.CreateEvent; +import com.redhat.persistence.DeleteEvent; +import com.redhat.persistence.Event; +import com.redhat.persistence.ObjectEvent; +import com.redhat.persistence.PropertyEvent; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.RemoveEvent; +import com.redhat.persistence.SetEvent; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Qualias; +import com.redhat.persistence.metadata.Role; +import com.redhat.persistence.metadata.SQLBlock; +import com.redhat.persistence.metadata.Static; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.Value; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; Modified: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/StatementLifecycle.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,7 @@ */ package com.redhat.persistence.engine.rdbms; -import java.sql.*; +import java.sql.SQLException; /** * StatementLifecycle Modified: ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/metadata/Qualias.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,7 @@ */ package com.redhat.persistence.metadata; -import com.redhat.persistence.common.*; +import com.redhat.persistence.common.Path; /** * Qualias Modified: ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/AbstractJoin.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,8 +18,15 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; -import java.util.*; +import com.redhat.persistence.metadata.Alias; +import com.redhat.persistence.metadata.Link; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Role; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * AbstractJoin Modified: ccm-core/trunk/src/com/redhat/persistence/oql/All.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/All.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/All.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,13 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.SQLBlock; +import java.util.Collections; +import java.util.Iterator; +import java.util.Map; /** * All Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Code.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Code.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Code.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,13 +18,33 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLToken; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.MetadataException; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.SQLBlock; import com.redhat.persistence.metadata.Static; - -import java.io.*; -import java.util.*; - +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.Value; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Define.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Define.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Define.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,14 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Role; +import java.util.Iterator; +import java.util.Map.Entry; +import java.util.Map; /** * Define Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Equals.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,8 @@ */ package com.redhat.persistence.oql; -import java.util.*; +import java.util.ArrayList; +import java.util.List; /** * Equals Modified: ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/EquiSet.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,16 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; - +import com.redhat.persistence.common.CompoundKey; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.commons.collections.list.*; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Exists.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,9 @@ */ package com.redhat.persistence.oql; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; /** * Exists Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Expression.java 2005-09-01 12:27:29 UTC (rev 735) @@ -19,8 +19,6 @@ package com.redhat.persistence.oql; import com.redhat.persistence.common.Path; -import com.redhat.persistence.metadata.*; -import java.util.*; /** * Expression Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Filter.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,8 +18,6 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; -import java.util.*; /** * Filter Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Generator.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,22 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; - +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLToken; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.collections.primitives.*; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Get.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Get.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Get.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,13 +18,28 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLToken; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Qualias; import com.redhat.persistence.metadata.Static; - -import java.io.*; -import java.util.*; - +import com.redhat.persistence.metadata.Value; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Indentor.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,8 @@ */ package com.redhat.persistence.oql; -import java.io.*; +import java.io.IOException; +import java.io.Writer; /** * Indentor Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,12 +18,17 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.PropertyMap; +import com.redhat.persistence.common.CompoundKey; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Root; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; -import java.util.*; - /** * Literal * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Main.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Main.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Main.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,12 +18,13 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.*; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.pdl.PDL; +import java.io.FileReader; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import java.io.*; -import java.util.*; - /** * Main * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/MultiMap.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,15 @@ */ package com.redhat.persistence.oql; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; import org.apache.commons.collections.list.*; -import java.util.*; - /** * MultiMap * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/OQLParser.jj 2005-09-01 12:27:29 UTC (rev 735) @@ -7,10 +7,15 @@ package com.redhat.persistence.oql; -import java.lang.reflect.*; -import java.math.*; -import java.util.*; -import java.io.*; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.math.BigDecimal; +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * OQLParser Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Or.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Or.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Or.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,6 @@ */ package com.redhat.persistence.oql; -import java.util.*; /** * Or Modified: ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/QFrame.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,24 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; - +import com.redhat.persistence.common.CompoundKey; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.ForeignKey; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Map; +import java.util.Set; import org.apache.commons.collections.list.*; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/QValue.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,7 +18,9 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.Table; /** * QValue Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Query.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Query.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Query.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,10 +18,15 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.metadata.*; +import com.redhat.persistence.metadata.Root; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.collections.map.LRUMap; -import java.util.*; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Static.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Static.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Static.java 2005-09-01 12:27:29 UTC (rev 735) @@ -19,14 +19,22 @@ package com.redhat.persistence.oql; import com.redhat.persistence.ProtoException; -import com.redhat.persistence.common.*; +import com.redhat.persistence.common.CompoundKey; import com.redhat.persistence.common.ParseException; -import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQL; +import com.redhat.persistence.common.SQLParser; +import com.redhat.persistence.common.SQLToken; import com.redhat.persistence.metadata.ObjectType; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import java.io.*; -import java.util.*; - /** * Static * Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/oql/Variable.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,9 +18,6 @@ */ package com.redhat.persistence.oql; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import java.util.*; /** * Variable Modified: ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/pdl/PDL.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,14 +18,67 @@ */ package com.redhat.persistence.pdl; -import com.arsdigita.util.*; -import com.redhat.persistence.common.*; -import com.redhat.persistence.metadata.*; -import com.redhat.persistence.pdl.nodes.*; - -import java.io.*; -import java.util.*; - +import com.arsdigita.util.WrappedError; +import com.redhat.persistence.common.Path; +import com.redhat.persistence.common.SQLParser; +import com.redhat.persistence.metadata.Adapter; +import com.redhat.persistence.metadata.Column; +import com.redhat.persistence.metadata.Constraint; +import com.redhat.persistence.metadata.DataOperation; +import com.redhat.persistence.metadata.ForeignKey; +import com.redhat.persistence.metadata.JoinFrom; +import com.redhat.persistence.metadata.JoinThrough; +import com.redhat.persistence.metadata.JoinTo; +import com.redhat.persistence.metadata.Link; +import com.redhat.persistence.metadata.Mapping; +import com.redhat.persistence.metadata.Model; +import com.redhat.persistence.metadata.ObjectMap; +import com.redhat.persistence.metadata.ObjectType; +import com.redhat.persistence.metadata.Property; +import com.redhat.persistence.metadata.Qualias; +import com.redhat.persistence.metadata.Role; +import com.redhat.persistence.metadata.Root; +import com.redhat.persistence.metadata.SQLBlock; +import com.redhat.persistence.metadata.Static; +import com.redhat.persistence.metadata.Table; +import com.redhat.persistence.metadata.UniqueKey; +import com.redhat.persistence.metadata.Value; +import com.redhat.persistence.pdl.nodes.AST; +import com.redhat.persistence.pdl.nodes.AggressiveLoadNd; +import com.redhat.persistence.pdl.nodes.AssociationNd; +import com.redhat.persistence.pdl.nodes.BindingNd; +import com.redhat.persistence.pdl.nodes.ColumnNd; +import com.redhat.persistence.pdl.nodes.DataOperationNd; +import com.redhat.persistence.pdl.nodes.DbTypeNd; +import com.redhat.persistence.pdl.nodes.EventNd; +import com.redhat.persistence.pdl.nodes.FileNd; +import com.redhat.persistence.pdl.nodes.IdentifierNd; +import com.redhat.persistence.pdl.nodes.JavaClassNd; +import com.redhat.persistence.pdl.nodes.JoinNd; +import com.redhat.persistence.pdl.nodes.JoinPathNd; +import com.redhat.persistence.pdl.nodes.MappingNd; +import com.redhat.persistence.pdl.nodes.Node; +import com.redhat.persistence.pdl.nodes.ObjectKeyNd; +import com.redhat.persistence.pdl.nodes.ObjectTypeNd; +import com.redhat.persistence.pdl.nodes.PathNd; +import com.redhat.persistence.pdl.nodes.PropertyNd; +import com.redhat.persistence.pdl.nodes.QualiasNd; +import com.redhat.persistence.pdl.nodes.ReferenceKeyNd; +import com.redhat.persistence.pdl.nodes.SQLBlockNd; +import com.redhat.persistence.pdl.nodes.SuperNd; +import com.redhat.persistence.pdl.nodes.TypeNd; +import com.redhat.persistence.pdl.nodes.UniqueKeyNd; +import java.io.FileReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/pdl/PDLParser.jj 2005-09-01 12:27:29 UTC (rev 735) @@ -7,7 +7,32 @@ package com.redhat.persistence.pdl; -import com.redhat.persistence.pdl.nodes.*; +import com.redhat.persistence.pdl.nodes.AggressiveLoadNd; +import com.redhat.persistence.pdl.nodes.AssociationNd; +import com.redhat.persistence.pdl.nodes.BindingNd; +import com.redhat.persistence.pdl.nodes.ColumnNd; +import com.redhat.persistence.pdl.nodes.DataOperationNd; +import com.redhat.persistence.pdl.nodes.DbTypeNd; +import com.redhat.persistence.pdl.nodes.EventNd; +import com.redhat.persistence.pdl.nodes.FileNd; +import com.redhat.persistence.pdl.nodes.IdentifierNd; +import com.redhat.persistence.pdl.nodes.ImportNd; +import com.redhat.persistence.pdl.nodes.JavaClassNd; +import com.redhat.persistence.pdl.nodes.JoinNd; +import com.redhat.persistence.pdl.nodes.JoinPathNd; +import com.redhat.persistence.pdl.nodes.MappingNd; +import com.redhat.persistence.pdl.nodes.ModelNd; +import com.redhat.persistence.pdl.nodes.Node; +import com.redhat.persistence.pdl.nodes.ObjectKeyNd; +import com.redhat.persistence.pdl.nodes.ObjectTypeNd; +import com.redhat.persistence.pdl.nodes.PathNd; +import com.redhat.persistence.pdl.nodes.PropertyNd; +import com.redhat.persistence.pdl.nodes.QualiasNd; +import com.redhat.persistence.pdl.nodes.ReferenceKeyNd; +import com.redhat.persistence.pdl.nodes.SQLBlockNd; +import com.redhat.persistence.pdl.nodes.SuperNd; +import com.redhat.persistence.pdl.nodes.TypeNd; +import com.redhat.persistence.pdl.nodes.UniqueKeyNd; /** * PDLParser Modified: ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java =================================================================== --- ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java 2005-09-01 10:46:05 UTC (rev 734) +++ ccm-core/trunk/src/com/redhat/persistence/profiler/rdbms/CompoundProfiler.java 2005-09-01 12:27:29 UTC (rev 735) @@ -18,11 +18,14 @@ */ package com.redhat.persistence.profiler.rdbms; -import com.redhat.persistence.engine.rdbms.*; +import com.redhat.persistence.engine.rdbms.RDBMSProfiler; +import com.redhat.persistence.engine.rdbms.RDBMSStatement; +import com.redhat.persistence.engine.rdbms.StatementLifecycle; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; -import java.sql.*; -import java.util.*; - /** * CompoundProfiler * |
Author: sskracic Date: 2005-09-01 12:46:05 +0200 (Thu, 01 Sep 2005) New Revision: 734 Modified: ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java ccm-core/trunk/src/com/arsdigita/core/DBCheck.java ccm-core/trunk/src/com/arsdigita/core/LibCheck.java ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java ccm-core/trunk/src/com/arsdigita/mail/Mail.java ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java ccm-core/trunk/src/com/arsdigita/packaging/Check.java ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java ccm-core/trunk/src/com/arsdigita/packaging/Clear.java ccm-core/trunk/src/com/arsdigita/packaging/Command.java ccm-core/trunk/src/com/arsdigita/packaging/Config.java ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java ccm-core/trunk/src/com/arsdigita/packaging/Files.java ccm-core/trunk/src/com/arsdigita/packaging/Get.java ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java ccm-core/trunk/src/com/arsdigita/packaging/Load.java ccm-core/trunk/src/com/arsdigita/packaging/Loader.java ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java ccm-core/trunk/src/com/arsdigita/packaging/Menu.java ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java ccm-core/trunk/src/com/arsdigita/packaging/Set.java ccm-core/trunk/src/com/arsdigita/packaging/Status.java ccm-core/trunk/src/com/arsdigita/packaging/Unload.java ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java ccm-core/trunk/src/com/arsdigita/packaging/Which.java ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java Log: NFC: getting rid of wildcard imports in com.arsdigita source tree. Modified: ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/categorization/CategoryMappingExistsException.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.categorization; -import com.arsdigita.kernel.*; +import com.arsdigita.kernel.ACSObject; /** * Modified: ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/BaseCheck.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,13 +19,18 @@ package com.arsdigita.core; import com.arsdigita.packaging.Check; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; +import com.arsdigita.util.Assert; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.net.URL; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; -import java.net.*; -import java.io.*; -import java.util.*; - /** * BaseCheck * Modified: ccm-core/trunk/src/com/arsdigita/core/DBCheck.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/DBCheck.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/DBCheck.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,13 +19,12 @@ package com.arsdigita.core; import com.arsdigita.db.DbHelper; -import com.arsdigita.packaging.*; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; +import com.arsdigita.packaging.ConfigRegistry; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.util.jdbc.Connections; +import java.sql.Connection; -import java.sql.*; - /** * DBCheck * Modified: ccm-core/trunk/src/com/arsdigita/core/LibCheck.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/LibCheck.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/LibCheck.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.core; -import com.arsdigita.runtime.*; +import com.arsdigita.runtime.ScriptContext; /** * LibCheck Modified: ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/core/TroikaRickshawUpgrade.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,17 +19,24 @@ package com.arsdigita.core; import com.arsdigita.db.DbHelper; -import com.arsdigita.initializer.*; +import com.arsdigita.initializer.Configuration; import com.arsdigita.initializer.Initializer; -import com.arsdigita.packaging.*; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.servlet.*; -import java.io.*; -import java.util.*; +import com.arsdigita.initializer.Script; +import com.arsdigita.packaging.Config; +import com.arsdigita.packaging.ConfigRegistry; +import com.arsdigita.packaging.RegistryConfig; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterContext; +import com.arsdigita.util.servlet.HttpHost; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/developersupport/DeveloperSupportProfiler.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,11 +18,12 @@ */ package com.arsdigita.developersupport; -import com.redhat.persistence.engine.rdbms.*; +import com.redhat.persistence.engine.rdbms.RDBMSProfiler; +import com.redhat.persistence.engine.rdbms.RDBMSStatement; +import com.redhat.persistence.engine.rdbms.StatementLifecycle; +import java.sql.SQLException; +import java.util.HashMap; -import java.sql.*; -import java.util.*; - /** * DeveloperSupportProfiler * Modified: ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj =================================================================== --- ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/initializer/ScriptParser.jj 2005-09-01 10:46:05 UTC (rev 734) @@ -7,9 +7,11 @@ package com.arsdigita.initializer; -import com.arsdigita.util.*; -import java.lang.reflect.*; -import java.util.*; +import com.arsdigita.util.Classes; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; /** * ScriptParser.java Modified: ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj =================================================================== --- ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/installer/StatementParser.jj 2005-09-01 10:46:05 UTC (rev 734) @@ -8,7 +8,7 @@ package com.arsdigita.installer; -import java.io.*; +import java.io.Reader; class StatementParser { Modified: ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/kernel/KernelConfig.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,9 +18,10 @@ */ package com.arsdigita.kernel; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.runtime.AbstractConfig; +import com.arsdigita.util.parameter.BooleanParameter; +import com.arsdigita.util.parameter.EnumerationParameter; +import com.arsdigita.util.parameter.Parameter; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/mail/Mail.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mail/Mail.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mail/Mail.java 2005-09-01 10:46:05 UTC (rev 734) @@ -35,7 +35,11 @@ import javax.activation.DataHandler; import javax.activation.FileDataSource; import javax.activation.URLDataSource; -import javax.mail.*; +import javax.mail.Message; +import javax.mail.MessagingException; +import javax.mail.SendFailedException; +import javax.mail.Session; +import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMultipart; Modified: ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mimetypes/image/GIFImageSizer.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.mimetypes.image; -import java.awt.*; +import java.awt.Dimension; import java.io.DataInputStream; import java.io.IOException; Modified: ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mimetypes/image/ImageSizer.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.mimetypes.image; -import java.awt.*; +import java.awt.Dimension; import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; Modified: ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/mimetypes/image/JPEGImageSizer.java 2005-09-01 10:46:05 UTC (rev 734) @@ -20,7 +20,7 @@ import com.arsdigita.mimetypes.util.GlobalizationUtil; -import java.awt.*; +import java.awt.Dimension; import java.io.DataInputStream; import java.io.IOException; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/arsdigita/packaging/Check.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Check.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Check.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,7 @@ */ package com.arsdigita.packaging; -import com.arsdigita.runtime.*; +import com.arsdigita.runtime.AbstractScript; /** * The Check class provides a developer callback for performing Modified: ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Checklist.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,17 +18,18 @@ */ package com.arsdigita.packaging; -import com.arsdigita.persistence.*; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; - +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.util.Classes; +import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.xml.XML; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; -import java.io.*; -import java.util.*; - /** * Checklist * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Clear.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Clear.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Clear.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.*; +import com.arsdigita.util.parameter.Parameter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.util.*; - -import org.apache.commons.cli.*; - /** * Clear * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Command.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Command.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Command.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,10 +18,12 @@ */ package com.arsdigita.packaging; -import java.io.*; +import java.io.PrintStream; +import java.io.PrintWriter; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; -import org.apache.commons.cli.*; - /** * Command * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Config.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Config.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Config.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,12 +19,20 @@ package com.arsdigita.packaging; import com.arsdigita.runtime.CCM; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.util.Classes; +import com.arsdigita.util.JavaPropertyWriter; +import com.arsdigita.util.parameter.ErrorList; +import com.arsdigita.util.parameter.ParameterContext; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; -import java.io.*; -import java.util.*; - /** * Config * Modified: ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/ConfigRegistry.java 2005-09-01 10:46:05 UTC (rev 734) @@ -26,11 +26,8 @@ import com.arsdigita.util.parameter.ParameterContext; import com.arsdigita.util.parameter.ParameterReader; import com.arsdigita.xml.XML; - -import java.io.File; import java.io.IOException; import java.io.InputStream; -import java.net.MalformedURLException; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; @@ -39,7 +36,6 @@ import java.util.List; import java.util.Map; import java.util.Properties; - import org.apache.log4j.Logger; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; Modified: ccm-core/trunk/src/com/arsdigita/packaging/Files.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Files.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Files.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,7 +18,8 @@ */ package com.arsdigita.packaging; -import java.io.*; +import java.io.File; +import java.io.IOException; /** * Commonly used file utilities. Modified: ccm-core/trunk/src/com/arsdigita/packaging/Get.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Get.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Get.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,25 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.*; +import com.arsdigita.util.JavaPropertyWriter; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterWriter; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Properties; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.OptionGroup; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.util.*; - -import org.apache.commons.cli.*; - /** * Get * Modified: ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/HostInit.java 2005-09-01 10:46:05 UTC (rev 734) @@ -20,7 +20,6 @@ import com.arsdigita.util.Files; import com.arsdigita.util.StringUtils; - import java.io.BufferedReader; import java.io.File; import java.io.FileReader; @@ -30,8 +29,11 @@ import java.util.jar.Attributes; import java.util.jar.JarFile; import java.util.jar.Manifest; - -import org.apache.commons.cli.*; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/packaging/Load.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Load.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Load.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,36 +19,50 @@ package com.arsdigita.packaging; import com.arsdigita.core.DBCheck; -import com.arsdigita.db.DbHelper; import com.arsdigita.loader.PackageLoader; import com.arsdigita.persistence.ConnectionSource; import com.arsdigita.persistence.DedicatedConnectionSource; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; -import com.arsdigita.persistence.TransactionContext; import com.arsdigita.persistence.metadata.MetadataRoot; import com.arsdigita.persistence.pdl.PDLCompiler; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; +import com.arsdigita.runtime.InteractiveParameterLoader; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.JavaPropertyReader; +import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.config.JavaPropertyLoader; import com.arsdigita.util.jdbc.Connections; -import com.arsdigita.util.parameter.*; -import com.arsdigita.kernel.KernelExcursion; -import com.arsdigita.kernel.Kernel; +import com.arsdigita.util.parameter.CompoundParameterLoader; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterContext; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Writer; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import org.apache.commons.cli.CommandLine; -import org.apache.commons.cli.PosixParser; -import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.OptionBuilder; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.sql.Connection; -import java.sql.SQLException; -import java.util.*; -import java.util.Set; - /** * PackageTool * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Loader.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Loader.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Loader.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,22 +18,31 @@ */ package com.arsdigita.packaging; -import com.arsdigita.db.*; -import com.arsdigita.persistence.*; -import com.arsdigita.persistence.metadata.*; -import com.arsdigita.persistence.pdl.*; -import com.arsdigita.kernel.*; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; -import com.arsdigita.runtime.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.KernelExcursion; +import com.arsdigita.loader.PackageLoader; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.runtime.CompoundInitializer; import com.arsdigita.runtime.Initializer; -import com.arsdigita.loader.*; - -import java.io.*; -import java.sql.*; -import java.util.*; +import com.arsdigita.runtime.Script; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.runtime.Startup; +import com.arsdigita.util.Classes; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.parameter.ParameterLoader; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Connection; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; import java.util.Set; - import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/MasterTool.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,12 +18,13 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import java.util.*; -import java.io.*; - -import org.apache.commons.cli.*; - +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/packaging/Menu.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Menu.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Menu.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,11 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import java.io.*; -import java.util.*; - /** * Menu * Modified: ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/ParameterEditor.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,12 +18,27 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.parameter.ErrorList; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterError; +import com.arsdigita.util.parameter.ParameterInfo; +import com.arsdigita.util.parameter.ParameterReader; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.PrintStream; +import java.io.PrintWriter; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; -import java.io.*; -import java.util.*; - /** * ParameterEditor * Modified: ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/ParameterMap.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,12 +18,19 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.util.parameter.ErrorList; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.ParameterContext; +import com.arsdigita.util.parameter.ParameterReader; +import java.io.OutputStreamWriter; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; -import java.io.*; -import java.util.*; - /** * ParameterMap * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Set.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Set.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Set.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.parameter.*; -import com.arsdigita.util.*; +import com.arsdigita.util.JavaPropertyReader; +import java.io.IOException; +import java.util.Iterator; +import java.util.Properties; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import java.io.*; -import java.util.*; - -import org.apache.commons.cli.*; - /** * Set * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Status.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Status.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Status.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,8 +18,10 @@ */ package com.arsdigita.packaging; -import com.arsdigita.persistence.*; -import com.arsdigita.runtime.*; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.runtime.Startup; /** * Status Modified: ccm-core/trunk/src/com/arsdigita/packaging/Unload.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Unload.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Unload.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,12 +19,16 @@ package com.arsdigita.packaging; import com.arsdigita.runtime.CCM; -import java.io.*; -import java.util.*; +import java.io.File; +import java.io.FileFilter; +import java.util.HashSet; import java.util.Set; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; -import org.apache.commons.cli.*; - /** * Unload * Modified: ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Upgrade.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,16 +18,29 @@ */ package com.arsdigita.packaging; -import com.arsdigita.runtime.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; +import com.arsdigita.runtime.RuntimeConfig; +import com.arsdigita.runtime.SchemaLoader; +import com.arsdigita.util.Assert; +import com.arsdigita.util.Classes; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.UncheckedWrapperException; +import com.arsdigita.util.jdbc.Connections; import com.arsdigita.xml.XML; -import java.io.*; -import java.lang.reflect.*; -import java.sql.*; -import java.util.*; -import org.apache.commons.cli.*; +import java.io.InputStream; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.MissingOptionException; +import org.apache.commons.cli.OptionBuilder; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.xml.sax.Attributes; import org.xml.sax.helpers.DefaultHandler; Modified: ccm-core/trunk/src/com/arsdigita/packaging/Which.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/packaging/Which.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/packaging/Which.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,10 +18,16 @@ */ package com.arsdigita.packaging; -import com.arsdigita.util.*; -import java.util.*; -import java.io.*; -import org.apache.commons.cli.*; +import com.arsdigita.util.UncheckedWrapperException; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Iterator; +import java.util.List; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/persistence/DedicatedConnectionSource.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,8 +18,8 @@ */ package com.arsdigita.persistence; -import com.arsdigita.util.jdbc.*; -import java.sql.*; +import com.arsdigita.util.jdbc.Connections; +import java.sql.Connection; /** * DedicatedConnectionSource Modified: ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/persistence/PooledConnectionSource.java 2005-09-01 10:46:05 UTC (rev 734) @@ -20,10 +20,15 @@ import com.arsdigita.util.UncheckedWrapperException; import com.arsdigita.util.jdbc.Connections; - -import java.sql.*; -import java.util.*; - +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/runtime/SchemaLoader.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,14 +18,10 @@ */ package com.arsdigita.runtime; -import com.arsdigita.db.*; -import com.arsdigita.installer.*; -import com.arsdigita.util.*; -import com.arsdigita.util.jdbc.*; -import com.arsdigita.util.parameter.*; -import java.io.*; -import java.sql.*; -import java.util.*; +import com.arsdigita.db.DbHelper; +import com.arsdigita.installer.SQLLoader; +import com.arsdigita.util.StringUtils; +import java.sql.Connection; import org.apache.log4j.Logger; /** Modified: ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/search/converter/ExcelConverter.java 2005-09-01 10:46:05 UTC (rev 734) @@ -19,15 +19,17 @@ package com.arsdigita.search.converter; import com.arsdigita.mimetypes.MimeType; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileInputStream; -import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; -import java.io.IOException; -import org.apache.poi.poifs.filesystem.*; -import org.apache.poi.hssf.record.*; -import org.apache.poi.hssf.eventusermodel.*; +import org.apache.poi.hssf.eventusermodel.HSSFEventFactory; +import org.apache.poi.hssf.eventusermodel.HSSFListener; +import org.apache.poi.hssf.eventusermodel.HSSFRequest; +import org.apache.poi.hssf.record.BOFRecord; +import org.apache.poi.hssf.record.LabelSSTRecord; +import org.apache.poi.hssf.record.NumberRecord; +import org.apache.poi.hssf.record.Record; +import org.apache.poi.hssf.record.SSTRecord; +import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.log4j.Logger; Modified: ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java =================================================================== --- ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java 2005-09-01 06:42:59 UTC (rev 733) +++ ccm-core/trunk/src/com/arsdigita/util/protocol/resource/Handler.java 2005-09-01 10:46:05 UTC (rev 734) @@ -18,8 +18,12 @@ */ package com.arsdigita.util.protocol.resource; -import java.net.*; -import java.io.*; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.net.URLConnection; +import java.net.URLStreamHandler; /** * Handler |
|
From: <ssk...@vh...> - 2005-09-01 06:51:52
|
Author: sskracic
Date: 2005-09-01 08:42:59 +0200 (Thu, 01 Sep 2005)
New Revision: 733
Modified:
ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SQLWriter.java
ccm-core/trunk/src/com/redhat/persistence/metadata/Adapter.java
ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java
ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/BooleanAd.java
ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java
Log:
Short story: added support for Postgres 8 JDBC driver.
Long story: Postgres 8 JDBC driver does not tolerate our completely
broken and incosistent management of Boolean values. Sometimes they're
being treated as boolean, sometimes the SQL code assumes that '0' or '1'
will be returned etc. Long term, this all should be fixed, for example
by killing the idea of genuine Boolean altogether (since Oracle does
not support it).
In the meantime, this change implements a hack which prevents
Boolean values to be provided via JDBC bind parameters for Postgres
database driver. Instead their literal values are provided in text of
SQL statement as either '0' or '1'. This had to be done to avoid errors
thrown by PG 8 JDBC driver: "no such operator: boolean == varchar" etc.
Those errors seem to be generated from (PG 8) JDBC client code, when
bind parameters where booleans are expected are filled with setString().
If boolean values are provided as literal values '0' and '1', PG backend
provides necessary casts automatically.
Modified: ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SQLWriter.java
===================================================================
--- ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SQLWriter.java 2005-08-29 12:21:39 UTC (rev 732)
+++ ccm-core/trunk/src/com/redhat/persistence/engine/rdbms/SQLWriter.java 2005-09-01 06:42:59 UTC (rev 733)
@@ -160,9 +160,21 @@
}
void writeBind(Object value, int jdbcType) {
- m_sql.append("?");
- m_bindings.add(value);
- m_types.add(new Integer(jdbcType));
+ boolean shouldBind = true;
+ Adapter ad = null;
+ if (value != null) {
+ Root root = m_engine.getSession().getRoot();
+ ad = root.getAdapter(value.getClass());
+ shouldBind = ad.isBindable();
+ }
+ if (shouldBind) {
+ m_sql.append("?");
+ m_bindings.add(value);
+ m_types.add(new Integer(jdbcType));
+ } else {
+ m_sql.append(ad.getLiteralCode(value));
+ }
+
}
void write(Code code) {
Modified: ccm-core/trunk/src/com/redhat/persistence/metadata/Adapter.java
===================================================================
--- ccm-core/trunk/src/com/redhat/persistence/metadata/Adapter.java 2005-08-29 12:21:39 UTC (rev 732)
+++ ccm-core/trunk/src/com/redhat/persistence/metadata/Adapter.java 2005-09-01 06:42:59 UTC (rev 733)
@@ -93,6 +93,33 @@
("not a bindable adapter: " + getClass().getName());
}
+ /**
+ * Determines whether the values can be provided via JDBC
+ * bind variables. It's normally set to 'true', unless we
+ * have some non-tolerant JDBC drivers (for example Postgres 8)
+ * which don't tolerate our completely broken and inconsistent
+ * management of Boolean values. If 'false', then the Adapter
+ * is responsible for providing the properly escaped String
+ * which will be a part of SQL statement text.
+ *
+ * @see getLiteralCode(Object)
+ */
+ public boolean isBindable() {
+ throw new UnsupportedOperationException
+ ("not a bindable adapter: " + getClass().getName());
+ }
+
+ /**
+ * Inserts literal value of passed object in SQL statement text.
+ * This method must be overridden if isBindable() is false.
+ *
+ * @see isBindable()
+ */
+ public String getLiteralCode(Object o) {
+ throw new UnsupportedOperationException
+ ("not a bindable adapter: " + getClass().getName());
+ }
+
public void mutate(ResultSet rs, String column, Object obj, int type)
throws SQLException {
throw new UnsupportedOperationException
Modified: ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java
===================================================================
--- ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java 2005-08-29 12:21:39 UTC (rev 732)
+++ ccm-core/trunk/src/com/redhat/persistence/oql/Literal.java 2005-09-01 06:42:59 UTC (rev 733)
@@ -18,14 +18,10 @@
*/
package com.redhat.persistence.oql;
-// XXX: dependency on c.a.db.DbHelper
-import com.arsdigita.db.DbHelper;
import com.redhat.persistence.*;
import com.redhat.persistence.common.*;
import com.redhat.persistence.metadata.*;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -119,12 +115,16 @@
if (pmap.getObjectType().isCompound()) {
bindcount = convert(pmap, result, root, key, bindcount);
} else {
- Object k = key == null ? null :
- new CompoundKey(key, new Integer(bindcount));
- Code.Binding b = new Code.Binding
- (k, value, ad.defaultJDBCType());
- result.add(new Code("?", Collections.singletonList(b)));
- bindcount++;
+ if (ad.isBindable()) {
+ Object k = key == null ? null :
+ new CompoundKey(key, new Integer(bindcount));
+ Code.Binding b = new Code.Binding
+ (k, value, ad.defaultJDBCType());
+ result.add(new Code("?", Collections.singletonList(b)));
+ bindcount++;
+ } else {
+ result.add(new Code(ad.getLiteralCode(value)));
+ }
}
}
Modified: ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/BooleanAd.java
===================================================================
--- ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/BooleanAd.java 2005-08-29 12:21:39 UTC (rev 732)
+++ ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/BooleanAd.java 2005-09-01 06:42:59 UTC (rev 733)
@@ -18,6 +18,7 @@
*/
package com.redhat.persistence.pdl.adapters;
+import com.arsdigita.db.DbHelper;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -51,6 +52,14 @@
}
}
+ public boolean isBindable() {
+ return DbHelper.getDatabase() != DbHelper.DB_POSTGRES;
+ }
+
+ public String getLiteralCode(Object o) {
+ return Boolean.TRUE.equals(o) ? "'1'" : "'0'";
+ }
+
public Object fetch(ResultSet rs, String column) throws SQLException {
boolean bool = rs.getBoolean(column);
if (rs.wasNull()) {
Modified: ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java
===================================================================
--- ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java 2005-08-29 12:21:39 UTC (rev 732)
+++ ccm-core/trunk/src/com/redhat/persistence/pdl/adapters/SimpleAdapter.java 2005-09-01 06:42:59 UTC (rev 733)
@@ -57,4 +57,8 @@
return false;
}
+ public boolean isBindable() {
+ return true;
+ }
+
}
|
|
From: <ssk...@vh...> - 2005-08-29 12:30:41
|
Author: sskracic
Date: 2005-08-29 14:21:39 +0200 (Mon, 29 Aug 2005)
New Revision: 732
Modified:
tools/trunk/misc/build-all.sh
Log:
build-all must not depend on any ccm* RPM installed previosuly on the box.
The first change eliminates the need of servlet RPM to be installed. The
second change eliminates the need for ccm-core RPM.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2005-08-29 12:18:20 UTC (rev 731)
+++ tools/trunk/misc/build-all.sh 2005-08-29 12:21:39 UTC (rev 732)
@@ -529,7 +529,7 @@
export CCM_RPM_DIR=$HOMETOPDIR
export CCM_RPMBUILD_FLAGS="$RPM_ARGS"
-export CLASSPATH="$CLASSPATH:$CCM_SHARED_LIB_DIST_DIR/servlet.jar"
+export CLASSPATH="$CLASSPATH:$VIRTUAL_ROOT/share/java/servlet-2.3.jar"
for i in $BUILD_APPS
@@ -554,7 +554,7 @@
export CCM_BUILD_COUNTER
fi
- CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools CCM_SCRIPTS_HOME=$VIRTUAL_ROOT/share/ccm-scripts CCM_CONFIG_HOME=$VIRTUAL_ROOT/share/ccm-devel $VIRTUAL_ROOT/share/ccm-scripts/bin/build.sh
+ CCM_SHARED_LIB_DIST_DIR=$VIRTUAL_ROOT/share/java CCM_CONFIG_LIB_DIR=$VIRTUAL_ROOT/share/java CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools CCM_SCRIPTS_HOME=$VIRTUAL_ROOT/share/ccm-scripts CCM_CONFIG_HOME=$VIRTUAL_ROOT/share/ccm-devel $VIRTUAL_ROOT/share/ccm-scripts/bin/build.sh
) || exit $?
(
|
|
From: <ssk...@vh...> - 2005-08-29 12:26:53
|
Author: sskracic
Date: 2005-08-29 14:18:20 +0200 (Mon, 29 Aug 2005)
New Revision: 731
Modified:
tools/trunk/scripts/bin/make-zip
Log:
Preserve existing ANT_OPTS, if exist.
Modified: tools/trunk/scripts/bin/make-zip
===================================================================
--- tools/trunk/scripts/bin/make-zip 2005-08-29 05:26:15 UTC (rev 730)
+++ tools/trunk/scripts/bin/make-zip 2005-08-29 12:18:20 UTC (rev 731)
@@ -108,7 +108,7 @@
my $build_root = shift;
if (defined $build_root) {
my $tmp_exists = -d File::Spec->catdir($build_root,'tmp');
- my $ant_opts="-Dapps.$ccm_app.version=$ccm_pkgversion";
+ my $ant_opts="$ENV{'ANT_OPTS'} -Dapps.$ccm_app.version=$ccm_pkgversion";
$ant_opts="$ant_opts -Ddeploy.conf.dir=" . File::Spec->catdir($build_root,'usr','share','ccm','conf');
$ant_opts="$ant_opts -Ddeploy.shared.lib.dir=" . File::Spec->catdir($build_root,'usr','share','java');
$ant_opts="$ant_opts -Ddeploy.private.lib.dir=" . File::Spec->catdir($build_root,'usr','share','java',"$ccm_package-$ccm_pkgversion");
|
Author: apevec Date: 2005-08-29 07:26:15 +0200 (Mon, 29 Aug 2005) New Revision: 730 Added: contrib/ccm-ldn-content-check/ contrib/ccm-ldn-content-check/trunk/ contrib/ccm-ldn-content-check/trunk/application.xml contrib/ccm-ldn-content-check/trunk/pdl/ contrib/ccm-ldn-content-check/trunk/pdl/com/ contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/ contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/ contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/cms/ contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/cms/check/ contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/cms/check/ContentCheck.pdl contrib/ccm-ldn-content-check/trunk/sql/ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/default/ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/default/table-cms_content_checks.sql contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-create.sql contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-drop.sql contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-create.sql contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-drop.sql contrib/ccm-ldn-content-check/trunk/src/ contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.config contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.load contrib/ccm-ldn-content-check/trunk/src/com/ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config.java contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config_parameter.properties contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/ContentCheckAlert.java contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Initializer.java contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Loader.java Log: Content Check Alerts - packaged as a small ccm app b/c of dep. on ccm-ldn-dublin Added: contrib/ccm-ldn-content-check/trunk/application.xml =================================================================== --- contrib/ccm-ldn-content-check/trunk/application.xml 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/application.xml 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<ccm:application name="ccm-ldn-content-check" + prettyName="Content Check Alerts" + version="1.0.0" + release="1" + xmlns:ccm="http://ccm.redhat.com/ccm-project"> + + <ccm:dependencies> + <ccm:requires name="ccm-ldn-dublin" version="1.4.3"/> + </ccm:dependencies> + + <ccm:contacts> + <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> + <ccm:contact uri="mailto:rh...@re..." type="support"/> + </ccm:contacts> + + <ccm:description> + Content Check Alerts checks periodically for outdated content items + and send email alerts to Content Owners. + </ccm:description> + +</ccm:application> Added: contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/cms/check/ContentCheck.pdl =================================================================== --- contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/cms/check/ContentCheck.pdl 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/pdl/com/arsdigita/london/cms/check/ContentCheck.pdl 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,41 @@ +model com.arsdigita.london.cms.check; + +query getOutdatedContent { + BigDecimal itemID; + String objectType; + String creatorContact; + + do { + select ci.item_id, ct.object_type, dc.creator_contact + from acs_object_lifecycle_map lcm, lifecycles lc, + ldn_dublin_core_item_map dcm, ldn_dublin_core_items dc, + content_types ct, + cms_items ci left outer join cms_content_checks cc + on ( ci.item_id = cc.item_id ) + where ci.type_id IN :contentTypes + and ci.version = 'live' + and ci.type_id = ct.type_id + and ci.item_id = lcm.item_id and lcm.cycle_id = lc.cycle_id + and ci.item_id = dcm.item_id and dcm.dublin_id = dc.dublin_id + and dc.creator_contact is not null + and nvl(cc.last_alert, lc.start_date_time) < sysdate - :intervalDays + } map { + itemID = ci.item_id; + objectType = ct.object_type; + creatorContact = dc.creator_contact; + } +} + +data operation updateContentCheck { + do { + begin + insert into cms_content_checks(item_id) + select item_id from cms_items + where item_id = :itemID + and not exists (select 1 from cms_content_checks + where item_id = :itemID); + update cms_content_checks cc set cc.last_alert = sysdate + where cc.item_id = :itemID; + end; + } +} Added: contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/default/table-cms_content_checks.sql =================================================================== --- contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/default/table-cms_content_checks.sql 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/default/table-cms_content_checks.sql 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,26 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +create table cms_content_checks( + item_id integer + constraint cms_cont_chk_pk primary key + constraint cms_cont_chk_fk references cms_items + on delete cascade, + last_alert date +); Added: contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-create.sql =================================================================== --- contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-create.sql 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-create.sql 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,21 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +@@ default/table-cms_content_checks.sql + Added: contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-drop.sql =================================================================== --- contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-drop.sql 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/oracle-se-drop.sql 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,21 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +drop table cms_content_checks; + Added: contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-create.sql =================================================================== --- contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-create.sql 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-create.sql 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,21 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +\i default/table-cms_content_checks.sql + Added: contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-drop.sql =================================================================== --- contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-drop.sql 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/sql/ccm-ldn-content-check/postgres-drop.sql 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,21 @@ +-- +-- Copyright (C) 2005 Red Hat Inc. All Rights Reserved. +-- +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-- +-- $Id$ + +drop table cms_content_checks; + Added: contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.config =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.config 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.config 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<registry> + <config class="com.arsdigita.london.cms.check.Config" + storage="ccm-ldn-content-check/content-check.properties"/> +</registry> Added: contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.load =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.load 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/ccm-ldn-content-check.load 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,15 @@ +<load> + <requires> + <table name="cms_items"/> + <initializer class="com.arsdigita.cms.Initializer"/> + <initializer class="com.arsdigita.london.cms.dublin.Initializer"/> + </requires> + <provides> + <table name="cms_content_checks"/> + <initializer class="com.arsdigita.london.cms.check.Initializer"/> + </provides> + <scripts> + <schema directory="ccm-ldn-content-check"/> + <data class="com.arsdigita.london.cms.check.Loader"/> + </scripts> +</load> Added: contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config.java =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config.java 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config.java 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,47 @@ +package com.arsdigita.london.cms.check; + +import com.arsdigita.runtime.AbstractConfig; +import com.arsdigita.util.parameter.IntegerParameter; +import com.arsdigita.util.parameter.Parameter; +import com.arsdigita.util.parameter.StringArrayParameter; + +public class Config extends AbstractConfig { + + private final Parameter m_contentCheckTypes; + + private final Parameter m_contentCheckInterval; + + private final Parameter m_contentCheckLimit; + + public Config() { + super(); + m_contentCheckTypes = new StringArrayParameter( + "com.arsdigita.cms.check_types", Parameter.OPTIONAL, + new String[] { "com.arsdigita.cms.contenttypes.Article", + "com.arsdigita.cms.contenttypes.MultiPartArticle" }); + m_contentCheckInterval = new IntegerParameter( + "com.arsdigita.cms.check_interval", Parameter.REQUIRED, + new Integer(17 * 7) // in days, 17 weeks is default + ); + m_contentCheckLimit = new IntegerParameter( + "com.arsdigita.cms.check_limit", Parameter.REQUIRED, + new Integer(0)); + register(m_contentCheckTypes); + register(m_contentCheckInterval); + register(m_contentCheckLimit); + + } + + public final String[] getContentCheckTypes() { + return (String[]) get(m_contentCheckTypes); + } + + public final Integer getContentCheckInterval() { + return (Integer) get(m_contentCheckInterval); + } + + public final Integer getContentCheckLimit() { + return (Integer) get(m_contentCheckLimit); + } + +} Added: contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config_parameter.properties =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config_parameter.properties 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Config_parameter.properties 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,15 @@ +com.arsdigita.cms.check_types.title=Content Check Alerts: list of Content Types +com.arsdigita.cms.check_types.purpose=Content Types for which Content Check Alerts are sent (fully-qualified names of associated data object types) +com.arsdigita.cms.check_types.example=com.arsdigita.cms.contenttypes.Article,com.arsdigita.cms.contenttypes.MultiPartArticle +com.arsdigita.cms.check_types.format=[string,string,...] + +com.arsdigita.cms.check_interval.title=Content Check Alerts: outdate period +com.arsdigita.cms.check_interval.purpose=Interval in days after publishing, when Content Check Alert is issued. Default is 17 weeks. 0 to disable Content Check. +com.arsdigita.cms.check_interval.example=119 +com.arsdigita.cms.check_interval.format=[integer] + +com.arsdigita.cms.check_limit.title=Content Check Alerts: maximum number per day +com.arsdigita.cms.check_limit.purpose=Alerts are sent out daily, up to this limit. 0 for no limit. +com.arsdigita.cms.check_limit.example=0 +com.arsdigita.cms.check_limit.format=[integer] + Added: contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/ContentCheckAlert.java =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/ContentCheckAlert.java 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/ContentCheckAlert.java 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,192 @@ +/* + * Copyright (C) 2005 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +package com.arsdigita.london.cms.check; + +import java.math.BigDecimal; +import java.net.URLEncoder; +import java.util.Collection; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.TimerTask; + +import org.apache.log4j.Logger; + +import com.arsdigita.cms.ContentItem; +import com.arsdigita.cms.ContentSection; +import com.arsdigita.cms.ContentType; +import com.arsdigita.cms.util.GlobalizationUtil; +import com.arsdigita.cms.workflow.CMSTask; +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.Party; +import com.arsdigita.mail.Mail; +import com.arsdigita.messaging.Message; +import com.arsdigita.messaging.MessagingException; +import com.arsdigita.notification.Notification; +import com.arsdigita.persistence.DataOperation; +import com.arsdigita.persistence.DataQuery; +import com.arsdigita.persistence.Session; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.util.StringUtils; +import com.arsdigita.util.servlet.HttpHost; +import com.arsdigita.web.URL; +import com.arsdigita.web.Web; +import com.arsdigita.web.WebConfig; + +/** + * A TimerTask which will send alerts when items become outdated. + * Configured by registry parameters: + * com.arsdigita.cms.check_types, com.arsdigita.cms.check_interval and com.arsdigita.cms.check_limit. + */ +public class ContentCheckAlert extends TimerTask { + + private static final Logger s_log = Logger.getLogger(ContentCheckAlert.class); + + private String[] checkTypes; + private Collection checkTypeIDs = null; + private Integer interval; + private Integer limit; + private String serverURL; + + public ContentCheckAlert(String[] checkTypes, Integer interval, Integer limit) { + super(); + this.checkTypes = checkTypes; + this.interval = interval; + this.limit = limit; + this.serverURL = URL.root().getURL(); + } + + public void run() { + Thread.currentThread().setName("content-check"); + s_log.warn("Content Check start"); + TransactionContext txn = null; + DataQuery outdated = null; + try { + txn = SessionManager.getSession().getTransactionContext(); + txn.beginTxn(); + if (checkTypeIDs == null) { + checkTypeIDs = new LinkedList(); + for (int i=0,n=checkTypes.length; i<n; i++) { + try { + ContentType ct = ContentType.findByAssociatedObjectType(checkTypes[i]); + checkTypeIDs.add(ct.getID()); + } catch (DataObjectNotFoundException donfe) { + s_log.error("Content Check: Content Type "+checkTypes[i]+ " not found."); + } + } + } + if ( !checkTypeIDs.isEmpty() ) { + outdated = SessionManager.getSession().retrieveQuery("com.arsdigita.london.cms.check.getOutdatedContent"); + checkContent(outdated); + } + txn.commitTxn(); + } catch (Exception e) { + s_log.warn("error: ", e); + try { + if (txn != null) { + if (outdated != null) { + outdated.close(); + } + txn.abortTxn(); + } + } catch (Exception ee) { + s_log.warn("double fault: ",ee); + } + } + } + + private void checkContent(DataQuery outdated) { + outdated.setParameter("intervalDays", interval); + outdated.setParameter("contentTypes", checkTypeIDs); + outdated.addOrder("creatorContact"); + int totalItems = 0; + if (outdated.next()) { + String sender = CMSTask.getAlertsSender().getPrimaryEmail().getEmailAddress(); + String prevContact = (String) outdated.get("creatorContact"); + int msgCountDown = limit.intValue(); + // max number of alerts per day, initial limit 0 means no limit + if (msgCountDown == 0) { + msgCountDown--; + } + int i = 0; + StringBuffer itemURLs = new StringBuffer(); + Collection itemIDs = new LinkedList(); + do { + totalItems++; + BigDecimal itemID = (BigDecimal) outdated.get("itemID"); + String objectType = (String) outdated.get("objectType"); + String contact = (String) outdated.get("creatorContact"); + if ( !contact.equals(prevContact) ) { + if (sendAlert(sender, prevContact, itemURLs, i)) { + saveLastAlerts(itemIDs); + msgCountDown--; + } + // reset list of items + i = 0; + itemURLs = new StringBuffer(); + itemIDs.clear(); + prevContact = contact; + } + itemIDs.add(itemID); + itemURLs.append(++i).append(". ").append(serverURL) + .append("/redirect?oid=") + .append(URLEncoder.encode("["+objectType+":{id="+itemID+"}]")) + .append("&context=").append(ContentItem.DRAFT) // .LIVE + .append(StringUtils.NEW_LINE).append(StringUtils.NEW_LINE); + } while (msgCountDown != 0 && outdated.next()); + if (msgCountDown != 0) { + outdated.close(); + if (sendAlert(sender, prevContact, itemURLs, i)) { + saveLastAlerts(itemIDs); + } + } else { + s_log.warn(limit+" limit reached"); + } + } + s_log.warn("check performed for "+totalItems+" item(s)"); + } + + private boolean sendAlert(String from, String to, StringBuffer itemURLs, int n) { + Object[] args = new Object[2]; + args[0] = new Integer(n); + args[1] = itemURLs.toString(); + String subject = (String) GlobalizationUtil.globalize("cms.ui.content_check_alert.subject").localize(); + String body = (String) GlobalizationUtil.globalize("cms.ui.content_check_alert.body", args).localize(); + try { + Mail.send(to, from, subject, body); + if (s_log.isDebugEnabled()) { + s_log.debug("Mail to:"+to+" from:"+from+" subject:"+subject+" body:"+body); + } + return true; + } catch (Exception e) { + s_log.error("email error: ",e); + return false; + } + } + + private void saveLastAlerts(Collection itemIDs) { + DataOperation op = SessionManager.getSession().retrieveDataOperation("com.arsdigita.london.cms.check.updateContentCheck"); + for (Iterator iter=itemIDs.iterator(); iter.hasNext(); ) { + op.setParameter("itemID", iter.next()); + op.execute(); + } + } + +} Added: contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Initializer.java =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Initializer.java 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Initializer.java 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,93 @@ +/* + * Copyright (C) 2005 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +package com.arsdigita.london.cms.check; + +import java.util.Calendar; +import java.util.Timer; + +import org.apache.log4j.Logger; + +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.DataInitEvent; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; + +/** + * The CMS Content Check initializer. + * + * @version $Id$ + */ +public class Initializer extends CompoundInitializer { + public final static String versionId = + "$Id$"; + + private static final Logger s_log = Logger.getLogger + (Initializer.class); + + private static final Config s_config = new Config(); + + static { + s_config.load(); + } + + private Timer contentCheckTimer = null; + + public Initializer() { + final String url = RuntimeConfig.getConfig().getJDBCURL(); + final int database = DbHelper.getDatabaseFromURL(url); + + add(new PDLInitializer + (new ManifestSource + ("ccm-ldn-content-check.pdl.mf", + new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")))); + } + + public void init(DataInitEvent ev) { + super.init(ev); + contentCheckTimer =startContentCheck(); + } + + public static Config getConfig() { + return s_config; + } + + public Timer startContentCheck() { + String[] checkTypes = s_config.getContentCheckTypes(); + Integer interval = s_config.getContentCheckInterval(); + Integer limit = s_config.getContentCheckLimit(); + Timer contentCheckTimer = null; + if (interval.intValue() > 0 && checkTypes != null && checkTypes.length > 0) { + contentCheckTimer = new Timer(true); + ContentCheckAlert task = new ContentCheckAlert(checkTypes, interval, limit); + Calendar nextDay5am = Calendar.getInstance(); + nextDay5am.add(Calendar.DATE, 1); + nextDay5am.set(Calendar.HOUR_OF_DAY, 5); + // daily cron job at 5am + contentCheckTimer.scheduleAtFixedRate(task, nextDay5am.getTime(), 60L * 60 * 1000 * 24 ); + s_log.info("Content Check runs daily at 05:00"); + } else { + s_log.info("Content Check is DISABLED"); + } + return contentCheckTimer; + } + +} Added: contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Loader.java =================================================================== --- contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Loader.java 2005-08-29 05:20:48 UTC (rev 729) +++ contrib/ccm-ldn-content-check/trunk/src/com/arsdigita/london/cms/check/Loader.java 2005-08-29 05:26:15 UTC (rev 730) @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2005 Red Hat Inc. All Rights Reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +package com.arsdigita.london.cms.check; + +import com.arsdigita.runtime.ScriptContext; +import com.arsdigita.loader.PackageLoader; + +import org.apache.log4j.Logger; + +/** + * Empty Loader. + * + * @version $Id$ + */ +public class Loader extends PackageLoader { + public final static String versionId = + "$Id$"; + + private static final Logger s_log = Logger.getLogger(Loader.class); + + public void run(final ScriptContext ctx) { + // empty + } +} |
|
From: <ap...@vh...> - 2005-08-29 05:29:17
|
Author: apevec
Date: 2005-08-29 07:20:48 +0200 (Mon, 29 Aug 2005)
New Revision: 729
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig.java
ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init
ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentSectionSetup.java
Log:
Default Task Alert configuration is moved out of enterprise.init
in a new registry parameter: com.arsdigita.cms.default_task_alerts
to make it easier to reconfigure default workflow alerts behviour.
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig.java 2005-08-29 05:18:32 UTC (rev 728)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig.java 2005-08-29 05:20:48 UTC (rev 729)
@@ -91,6 +91,7 @@
private final Parameter m_publishLifecycleListenerClass;
private final Parameter m_notifyAuthorOnLifecycle;
private final Parameter m_saveTextCleansWordTags;
+ private final Parameter m_defaultTaskAlerts;
/**
* Do not instantiate this class directly.
@@ -116,6 +117,14 @@
PublishToFile.class,
PublishToFileListener.class);
+ m_defaultTaskAlerts = new StringArrayParameter
+ ("com.arsdigita.cms.default_task_alerts",
+ Parameter.REQUIRED, new String[] {
+ "Authoring:enable:finish:rollback",
+ "Approval:enable:finish:rollback",
+ "Deploy:enable:finish:rollback" }
+ );
+
// XXX these are probably temporary parameters, as the
// item/template resolvers will be determined by the successor
// to SectionInitializer. However, it still may be useful to
@@ -243,6 +252,7 @@
register(m_publishLifecycleListenerClass);
register(m_notifyAuthorOnLifecycle);
register(m_saveTextCleansWordTags);
+ register(m_defaultTaskAlerts);
loadInfo();
}
@@ -351,6 +361,10 @@
return ((Boolean) get(m_saveTextCleansWordTags)).booleanValue();
}
+ public final String[] getDefaultTaskAlerts() {
+ return (String[]) get(m_defaultTaskAlerts);
+ }
+
private class SpecificClassParameter extends ClassParameter {
private Class m_requiredClass;
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties 2005-08-29 05:18:32 UTC (rev 728)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ContentSectionConfig_parameter.properties 2005-08-29 05:20:48 UTC (rev 729)
@@ -122,3 +122,10 @@
com.arsdigita.cms.save_text_cleans_word_tags.purpose=Wether the Wysiwyg editor should clear the text of MSWord tags, everytime the user clicks on 'Save'
com.arsdigita.cms.save_text_cleans_word_tags.example=false
com.arsdigita.cms.save_text_cleans_word_tags.format=[boolean]
+
+
+com.arsdigita.cms.default_task_alerts.title=Default task alerts
+com.arsdigita.cms.default_task_alerts.purpose=Define for each task type on which workflow actions alert notifications are generated
+com.arsdigita.cms.default_task_alerts.example=Authoring:enable:finish:rollback,Approval:enable:finish:rollback,Deploy:enable:finish:rollback
+com.arsdigita.cms.default_task_alerts.format=[string,string,string]
+
Modified: ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init 2005-08-29 05:18:32 UTC (rev 728)
+++ ccm-cms/trunk/src/com/arsdigita/cms/enterprise.init 2005-08-29 05:20:48 UTC (rev 729)
@@ -129,17 +129,20 @@
// changes. There are four action types for each task type: enable,
// disable, finish, and rollback. Note that the values below are
// based on the task labels, and as such are not globalized.
- taskAlerts = {
- { "Authoring",
- { "enable", "finish", "rollback" }
- },
- { "Approval",
- { "enable", "finish", "rollback" }
- },
- { "Deploy",
- { "enable", "finish", "rollback" }
- }
- };
+ //
+ // Default value (site-wide) is handled via the parameter
+ // com.arsdigita.cms.default_task_alerts.
+ // taskAlerts = {
+ // { "Authoring",
+ // { "enable", "finish", "rollback" }
+ // },
+ // { "Approval",
+ // { "enable", "finish", "rollback" }
+ // },
+ // { "Deploy",
+ // { "enable", "finish", "rollback" }
+ // }
+ // };
// Parameters controlling Overdue Task alerts:
@@ -158,15 +161,15 @@
maxAlerts = 5;
// default value (site-wide) is handled via the parameter
- // com.arsdigita.cms.ContentSectionConfig.default_item_resolver_class.
- // section-specific override cna be added here. only uncomment if
+ // com.arsdigita.cms.default_item_resolver_class.
+ // section-specific override can be added here. only uncomment if
// you are changing from the default for a specific content section
// Name of the item resolver class. This class must implement com.arsdigita.cms.dispatcher.ItemResolver.
//itemResolverClass = "com.arsdigita.cms.dispatcher.MultilingualItemResolver";
// default value (site-wide) is handled via the parameter
- // com.arsdigita.cms.ContentSectionConfig.default_template_resolver_class.
- // section-specific override cna be added here. only uncomment if
+ // com.arsdigita.cms.default_template_resolver_class.
+ // section-specific override can be added here. only uncomment if
// you are changing from the default for a specific content section
// Name of the template resolver class. This class must implement com.arsdigita.cms.dispatcher.TemplateResolver.
//templateResolverClass = "com.arsdigita.cms.dispatcher.DefaultTemplateResolver";
Modified: ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentSectionSetup.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentSectionSetup.java 2005-08-29 05:18:32 UTC (rev 728)
+++ ccm-cms/trunk/src/com/arsdigita/cms/installer/ContentSectionSetup.java 2005-08-29 05:20:48 UTC (rev 729)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved.
+ * Copyright (C) 2003-2005 Red Hat Inc. All Rights Reserved.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
@@ -18,6 +18,24 @@
*/
package com.arsdigita.cms.installer;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.Date;
+import java.util.EmptyStackException;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Stack;
+import java.util.StringTokenizer;
+import java.util.Timer;
+
+import org.apache.log4j.Logger;
+import org.xml.sax.Attributes;
+import org.xml.sax.helpers.DefaultHandler;
+
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.RootCategoryCollection;
import com.arsdigita.cms.ContentSection;
@@ -36,11 +54,9 @@
import com.arsdigita.domain.DomainObject;
import com.arsdigita.initializer.InitializationException;
import com.arsdigita.kernel.ACSObjectInstantiator;
-import com.arsdigita.kernel.EmailAddress;
import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.PartyCollection;
import com.arsdigita.kernel.Role;
-import com.arsdigita.kernel.User;
import com.arsdigita.kernel.permissions.PermissionService;
import com.arsdigita.kernel.permissions.PrivilegeDescriptor;
import com.arsdigita.persistence.DataObject;
@@ -49,20 +65,6 @@
import com.arsdigita.web.ApplicationSetup;
import com.arsdigita.workflow.simple.WorkflowTemplate;
import com.arsdigita.xml.XML;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Date;
-import java.util.EmptyStackException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-import java.util.Timer;
-import org.apache.log4j.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.helpers.DefaultHandler;
/**
* Sets up the content section.
@@ -509,11 +511,25 @@
}
public void loadAlertPrefs(List tasks) {
- Iterator taskIter = null;
- if (tasks != null) {
- taskIter = tasks.iterator();
- }
- if (taskIter != null) {
+ if (tasks == null) {
+ // fallback to default com.arsdigita.cms.default_task_alerts registry parameter
+ String[] defaultTaskAlerts = ContentSection.getConfig().getDefaultTaskAlerts();
+ if (defaultTaskAlerts != null) {
+ for (int i=0,n=defaultTaskAlerts.length; i<n; i++) {
+ StringTokenizer tok = new StringTokenizer(defaultTaskAlerts[i],":");
+ try {
+ String taskName = tok.nextToken();
+ while (tok.hasMoreTokens()) {
+ String operation = tok.nextToken();
+ CMSTask.addAlert(m_section, taskName, operation);
+ }
+ } catch (NoSuchElementException nsee) {
+ s_log.warn("Invalid task alerts definition");
+ }
+ }
+ }
+ } else {
+ Iterator taskIter = tasks.iterator();
while (taskIter.hasNext()) {
List oneTask = (List) taskIter.next();
String taskName = (String) oneTask.get(0);
|
|
From: <ap...@vh...> - 2005-08-29 05:27:03
|
Author: apevec
Date: 2005-08-29 07:18:32 +0200 (Mon, 29 Aug 2005)
New Revision: 728
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties
Log:
email template for Content Check Alert
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties 2005-08-29 05:17:57 UTC (rev 727)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/CMSResources.properties 2005-08-29 05:18:32 UTC (rev 728)
@@ -816,3 +816,5 @@
If you have any questions, please contact the system adminstrator at {4}.\n\
Thank you for using {3}.\n
cms.contentassets.ui.description=Description
+cms.ui.content_check_alert.subject=Content Check Alert
+cms.ui.content_check_alert.body=Dear Author\n\nYou are listed as the Content Owner for the following {0} web page(s). Please check if they need amending or updating in any way:\n\n{1}\nIf you have any amendments or questions please email the appropriate web editor:\n\nsa...@ap... (Council & Democracy, Environment, Education)\njo...@ap... (Community & Living, Business, Social Care)\nfr...@ap... (Council & Democracy, Environment, Education)\n\nYou can contact web...@ap... with any questions about this email\n
|
|
From: <ap...@vh...> - 2005-08-29 05:26:29
|
Author: apevec
Date: 2005-08-29 07:17:57 +0200 (Mon, 29 Aug 2005)
New Revision: 727
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/workflow/UnfinishedTaskNotifier.java
Log:
Mark timer thread, so it can be distinguished in a JVM thread dump
Modified: ccm-cms/trunk/src/com/arsdigita/cms/workflow/UnfinishedTaskNotifier.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/workflow/UnfinishedTaskNotifier.java 2005-08-29 05:16:43 UTC (rev 726)
+++ ccm-cms/trunk/src/com/arsdigita/cms/workflow/UnfinishedTaskNotifier.java 2005-08-29 05:17:57 UTC (rev 727)
@@ -84,6 +84,7 @@
}
public void run() {
+ Thread.currentThread().setName("unfinished-notifier");
try {
new KernelExcursion() {
protected final void excurse() {
|
|
From: <ap...@vh...> - 2005-08-29 05:25:19
|
Author: apevec Date: 2005-08-29 07:16:43 +0200 (Mon, 29 Aug 2005) New Revision: 726 Modified: ccm-cms/trunk/pdl/com/arsdigita/content-section/Content-queries.pdl Log: PDL is not executable Property changes on: ccm-cms/trunk/pdl/com/arsdigita/content-section/Content-queries.pdl ___________________________________________________________________ Name: svn:executable - * |
|
From: <ssk...@vh...> - 2005-08-26 23:27:51
|
Author: sskracic
Date: 2005-08-27 01:19:25 +0200 (Sat, 27 Aug 2005)
New Revision: 725
Modified:
tools/trunk/misc/build-all.sh
Log:
Bootstrapping the build-all from the machine with no ccm-tools
installed beforehand was not possible, now it is.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2005-08-26 21:49:14 UTC (rev 724)
+++ tools/trunk/misc/build-all.sh 2005-08-26 23:19:25 UTC (rev 725)
@@ -471,7 +471,7 @@
set -e
cd tools/devel
check_svn_tagged
- ./rollingbuild.sh
+ CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools ./rollingbuild.sh
DEVEL_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
DEVEL_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
$RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm
@@ -482,7 +482,7 @@
set -e
cd tools/scripts
check_svn_tagged
- ./rollingbuild.sh
+ CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools ./rollingbuild.sh
SCRIPTS_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
SCRIPTS_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
$RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm
@@ -554,7 +554,7 @@
export CCM_BUILD_COUNTER
fi
- $CCM_SCRIPTS_HOME/bin/build.sh
+ CCM_TOOLS_HOME=$VIRTUAL_ROOT/share/ccm-tools CCM_SCRIPTS_HOME=$VIRTUAL_ROOT/share/ccm-scripts CCM_CONFIG_HOME=$VIRTUAL_ROOT/share/ccm-devel $VIRTUAL_ROOT/share/ccm-scripts/bin/build.sh
) || exit $?
(
|
|
From: <ssk...@vh...> - 2005-08-26 21:57:54
|
Author: sskracic
Date: 2005-08-26 23:49:14 +0200 (Fri, 26 Aug 2005)
New Revision: 724
Modified:
tools/trunk/misc/build-all.sh
Log:
When installing RPMs into virtual build filesystem, we don't need
to execute various pre/post install scripts, such as user account
creation etc.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2005-08-23 16:56:33 UTC (rev 723)
+++ tools/trunk/misc/build-all.sh 2005-08-26 21:49:14 UTC (rev 724)
@@ -435,7 +435,7 @@
rpmbuild --define="_topdir $HOMETOPDIR" -ba fake.spec
- $RPM $RPM_ARGS -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
+ $RPM $RPM_ARGS -ivh --noscripts $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
export RPM_DIR=$HOMETOPDIR
@@ -450,7 +450,7 @@
TOOLS_NAME=`grep 'Name:' *.spec | sed -e 's/Name://' | sed -e 's/ //g'`
TOOLS_VERSION=`grep 'Version:' *.spec | sed -e 's/Version://' | sed -e 's/ //g'`
TOOLS_RELEASE=`grep 'Release:' *.spec | sed -e 's/Release://' | sed -e 's/ //g'`
- $RPM $RPM_ARGS -ivh --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc $HOMERPMDIR/$TOOLS_NAME-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
+ $RPM $RPM_ARGS -ivh --noscripts --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc $HOMERPMDIR/$TOOLS_NAME-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
) || exit $?
done
@@ -462,7 +462,7 @@
TOOLS_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
ccm_tools_home="$HOMEBUILDDIR/ccm-tools-$TOOLS_VERSION"
CCM_TOOLS_HOME="$ccm_tools_home" ./rollingbuild.sh
- $RPM $RPM_ARGS -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
+ $RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm
# $BUILD_HOME/rpm -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var --define "_dbpath $VIRTUAL_ROOT/rpmdb" $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm
) || exit $?
. $VIRTUAL_ROOT/etc/profile.d/ccm-tools.sh
@@ -474,7 +474,7 @@
./rollingbuild.sh
DEVEL_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
DEVEL_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
- $RPM $RPM_ARGS -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm
+ $RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm
) || exit $?
. $VIRTUAL_ROOT/etc/profile.d/ccm-devel.sh
@@ -485,7 +485,7 @@
./rollingbuild.sh
SCRIPTS_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
SCRIPTS_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
- $RPM $RPM_ARGS -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm
+ $RPM $RPM_ARGS -ivh --noscripts --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm
) || exit $?
. $VIRTUAL_ROOT/etc/profile.d/ccm-scripts.sh
@@ -496,7 +496,7 @@
./rollingbuild.sh
BUNDLE_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'`
BUNDLE_RELEASE="`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'`${SVN_REVISION}"
- $RPM $RPM_ARGS -ivh --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm
+ $RPM $RPM_ARGS -ivh --noscripts --relocate /usr=$VIRTUAL_ROOT $HOMERPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm
) || exit $?
fi
@@ -560,7 +560,7 @@
(
set -e
set_application_properties $i
- $RPM $RPM_ARGS --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -ivh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
+ $RPM $RPM_ARGS --noscripts --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -ivh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
) || exit $?
done
|
|
From: <ssk...@vh...> - 2005-08-23 17:05:09
|
Author: sskracic
Date: 2005-08-23 18:56:33 +0200 (Tue, 23 Aug 2005)
New Revision: 723
Added:
ccm-core/trunk/sql/ccm-core/oracle-se/lucene/trigger-sync_lucene_docs.sql
ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/
ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
ccm-core/trunk/sql/ccm-core/postgres/lucene/trigger-sync_lucene_docs.sql
ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/
ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
Modified:
ccm-core/trunk/application.xml
ccm-core/trunk/sql/ccm-core/oracle-se-create.sql
ccm-core/trunk/sql/ccm-core/postgres-create.sql
ccm-core/trunk/src/ccm-core.upgrade
Log:
Solving the problem of FileAttachments not being deleted from search
index when their master item is deleted. This issue was affecting
all deployments with Lucene search enabled, be it on Postgres or
Oracle. Intermedia search was not plagued with the same problem, since
search_content.object_id references acs_objects.object_id with ON DELETE
CASCADE rule, so it's removed from search index as soon as an attachment
is removed from database. This solution, with a trigger on acs_objects
which fires on delete event, is very similar: whenever an acs_object is
deleted, the corresponding row in lucene_docs is marked as deleted and
dirty for all hosts in the cluster.
Modified: ccm-core/trunk/application.xml
===================================================================
--- ccm-core/trunk/application.xml 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/application.xml 2005-08-23 16:56:33 UTC (rev 723)
@@ -3,7 +3,7 @@
name="ccm-core"
prettyName="Core"
version="6.1.2"
- release="6"
+ release="7"
webapp="ROOT"
buildHooks="build-hooks.xml">
<ccm:dependencies>
Added: ccm-core/trunk/sql/ccm-core/oracle-se/lucene/trigger-sync_lucene_docs.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/oracle-se/lucene/trigger-sync_lucene_docs.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/oracle-se/lucene/trigger-sync_lucene_docs.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -0,0 +1,15 @@
+
+create or replace trigger sync_lucene_docs_tr
+ after delete
+ on acs_objects
+ for each row
+begin
+ update lucene_docs set
+ is_deleted = '1',
+ dirty = 2147483647,
+ timestamp = sysdate
+ where document_id = :old.object_id ;
+end;
+/
+show errors
+
Property changes on: ccm-core/trunk/sql/ccm-core/oracle-se/lucene/trigger-sync_lucene_docs.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Added: ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -0,0 +1,15 @@
+
+create or replace trigger sync_lucene_docs_tr
+ after delete
+ on acs_objects
+ for each row
+begin
+ update lucene_docs set
+ is_deleted = '1',
+ dirty = 2147483647,
+ timestamp = sysdate
+ where document_id = :old.object_id ;
+end;
+/
+show errors
+
Property changes on: ccm-core/trunk/sql/ccm-core/oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Modified: ccm-core/trunk/sql/ccm-core/oracle-se-create.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/oracle-se-create.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/oracle-se-create.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -278,6 +278,7 @@
@@ default/web/index-application_type_privilege_map.sql
@@ oracle-se/lucene/proc-update-dirty.sql
+@@ oracle-se/lucene/trigger-sync_lucene_docs.sql
@@ default/kernel/index-foreign_keys.sql
Added: ccm-core/trunk/sql/ccm-core/postgres/lucene/trigger-sync_lucene_docs.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/postgres/lucene/trigger-sync_lucene_docs.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/postgres/lucene/trigger-sync_lucene_docs.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -0,0 +1,16 @@
+
+create or replace function sync_lucene_docs_fn () returns trigger as '
+begin
+ update lucene_docs set
+ is_deleted = ''t'',
+ dirty = 2147483647,
+ timestamp = current_date
+ where document_id = old.object_id ;
+ return null;
+end;' language 'plpgsql';
+
+create trigger sync_lucene_docs_tr
+ after delete on acs_objects
+ for each row execute procedure
+ sync_lucene_docs_fn();
+
Property changes on: ccm-core/trunk/sql/ccm-core/postgres/lucene/trigger-sync_lucene_docs.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Added: ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -0,0 +1,16 @@
+
+create or replace function sync_lucene_docs_fn () returns trigger as '
+begin
+ update lucene_docs set
+ is_deleted = ''t'',
+ dirty = 2147483647,
+ timestamp = current_date
+ where document_id = old.object_id ;
+ return null;
+end;' language 'plpgsql';
+
+create trigger sync_lucene_docs_tr
+ after delete on acs_objects
+ for each row execute procedure
+ sync_lucene_docs_fn();
+
Property changes on: ccm-core/trunk/sql/ccm-core/postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Modified: ccm-core/trunk/sql/ccm-core/postgres-create.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/postgres-create.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/postgres-create.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -263,6 +263,7 @@
\i postgres/lucene/proc-update-dirty.sql
+\i postgres/lucene/trigger-sync_lucene_docs.sql
\i default/mimetypes/insert-cms_mime_status.sql
Added: ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -0,0 +1,19 @@
+--
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id$
+-- $DateTime: 2004/08/16 18:10:38 $
+
+@@ ../oracle-se/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
Property changes on: ccm-core/trunk/sql/ccm-core/upgrade/oracle-se-6.1.1-6.1.2.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Added: ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
===================================================================
--- ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql 2005-08-23 16:56:33 UTC (rev 723)
@@ -0,0 +1,20 @@
+-- This library is free software; you can redistribute it and/or
+-- modify it under the terms of the GNU Lesser General Public License
+-- as published by the Free Software Foundation; either version 2.1 of
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+-- $Id$
+-- $DateTime: 2004/08/16 18:10:38 $
+
+begin;
+ \i ../postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql
+commit;
Property changes on: ccm-core/trunk/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql
___________________________________________________________________
Name: svn:keywords
+ Id Author URL
Modified: ccm-core/trunk/src/ccm-core.upgrade
===================================================================
--- ccm-core/trunk/src/ccm-core.upgrade 2005-08-23 15:33:41 UTC (rev 722)
+++ ccm-core/trunk/src/ccm-core.upgrade 2005-08-23 16:56:33 UTC (rev 723)
@@ -7,4 +7,7 @@
<version from="6.1.0" to="6.1.1">
<script sql="ccm-core/upgrade/::database::-6.1.0-6.1.1.sql"/>
</version>
+ <version from="6.1.1" to="6.1.2">
+ <script sql="ccm-core/upgrade/::database::-6.1.1-6.1.2.sql"/>
+ </version>
</upgrade>
|
|
From: <ap...@vh...> - 2005-08-23 15:41:56
|
Author: apevec
Date: 2005-08-23 17:33:41 +0200 (Tue, 23 Aug 2005)
New Revision: 722
Modified:
tools/trunk/tools/lib/CCM/Runtime.pm
Log:
autodetect newer Pg (7.4) and Oracle ( >= 9.2 ) JDBC JARs
Modified: tools/trunk/tools/lib/CCM/Runtime.pm
===================================================================
--- tools/trunk/tools/lib/CCM/Runtime.pm 2005-08-23 15:26:58 UTC (rev 721)
+++ tools/trunk/tools/lib/CCM/Runtime.pm 2005-08-23 15:33:41 UTC (rev 722)
@@ -149,12 +149,21 @@
if (!defined $self->{classpath}) {
my $classpath = defined $ENV{'CLASSPATH'} ? $ENV{'CLASSPATH'} : "";
if ( defined $ENV{'ORACLE_HOME'} ) {
- my $classes12 = File::Spec->catfile($ENV{'ORACLE_HOME'}, 'jdbc', 'lib', 'classes12.jar');
- $classpath = CCM::Util::catpath($classpath, $classes12);
+ my $jdbclib = File::Spec->catfile($ENV{'ORACLE_HOME'}, 'jdbc', 'lib');
+ # prefer JDBC3 driver
+ my $jar = File::Spec->catfile($jdbclib, 'ojdbc14.jar');
+ if (! -f $jar) {
+ $jar = File::Spec->catfile($jdbclib, 'classes12.jar');
+ }
+ $classpath = CCM::Util::catpath($classpath, $jar);
}
my $postgresql_jdbc = $ENV{'PG_JDBC2_LIB'};
- my @pg_jdbc_locs = ("/usr/share/java/rh-postgresql3.jar",
- "/usr/share/pgsql/java/rh-postgresql3.jar");
+ my @pg74jars = glob("/usr/share/java/pg74*jdbc3.jar");
+ # take the latest available
+ my $pg74jar = pop @pg74jars;
+ my @pg_jdbc_locs = ( $pg74jar,
+ "/usr/share/java/rh-postgresql3.jar",
+ "/usr/share/pgsql/java/rh-postgresql3.jar" );
for my $jar (@pg_jdbc_locs) {
last if defined $postgresql_jdbc;
$postgresql_jdbc = $jar if -f $jar;
|
|
From: <ap...@vh...> - 2005-08-23 15:35:24
|
Author: apevec Date: 2005-08-23 17:26:58 +0200 (Tue, 23 Aug 2005) New Revision: 721 Modified: tools/trunk/tools/commands/hostinit tools/trunk/tools/commands/hostinit.usage Log: hostinit --clean is required, otherwise old files under webapps directory are not overwriten Modified: tools/trunk/tools/commands/hostinit =================================================================== --- tools/trunk/tools/commands/hostinit 2005-08-22 15:28:15 UTC (rev 720) +++ tools/trunk/tools/commands/hostinit 2005-08-23 15:26:58 UTC (rev 721) @@ -47,6 +47,9 @@ CCM::CommandsUtil::printHelpAndExit() if $help; CCM::CommandsUtil::printUsageAndExit() if $usage; +# hostinit doesn't actually do anything useful without --clean, +# but we cannot make it default since it is destructive +CCM::CommandsUtil::printUsageAndExit() if not $clean; my $conf = CCM::CommandsUtil::getServletContainerCommand($sc, 'conf'); Modified: tools/trunk/tools/commands/hostinit.usage =================================================================== --- tools/trunk/tools/commands/hostinit.usage 2005-08-22 15:28:15 UTC (rev 720) +++ tools/trunk/tools/commands/hostinit.usage 2005-08-23 15:26:58 UTC (rev 721) @@ -4,7 +4,13 @@ --help Display help --usage Print this message --container Specify the servlet container to initialize - --clean Delete the existing webapp directories before - performing file copy + --clean REQUIRED: Delete the existing webapp directories + before performing file copy. + + NOTE: you might want to *BACKUP* THEMES and TEMPLATES first: + $CCM_HOME/webapps/ROOT/packages/content-section/templates/ + $CCM_HOME/webapps/ccm-ldn-theme/__ccm__/themes-prod/ + $CCM_HOME/webapps/ccm-ldn-theme/__ccm__/themes-dev/ + --parameter <key>=<value> Specify a parameter value (e.g. http-port) to be - used in servlet configuration \ No newline at end of file + used in servlet configuration |
|
From: <ap...@vh...> - 2005-08-22 15:36:28
|
Author: apevec
Date: 2005-08-22 17:28:15 +0200 (Mon, 22 Aug 2005)
New Revision: 720
Modified:
ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl
ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl
ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java
ccm-cms/trunk/web/packages/content-section/xsl/content-center.xsl
Log:
content-center task list view:
- make Action column sortable
- add sortable Workflow column
- change default filter to View your locked tasks
Modified: ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl
===================================================================
--- ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl 2005-08-22 14:49:42 UTC (rev 719)
+++ ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.ora.pdl 2005-08-22 15:28:15 UTC (rev 720)
@@ -36,9 +36,9 @@
String taskType;
String taskTypeClass;
Integer status;
+ String processLabel;
do {
- select * from
- (select cw_tasks.task_id,
+ select cw_tasks.task_id,
cw_tasks.parent_task_id,
cw_tasks.label,
cw_tasks.description,
@@ -48,27 +48,29 @@
( cw_user_tasks.is_locked )
ELSE
( 'f' )
- END as is_locked,
+ END as is_locked,
cw_user_tasks.due_date,
cms_items.section_id,
cms_items.item_id,
cms_items.name,
cms_pages.title,
- CASE WHEN (cw_user_tasks.locking_user_id = :userId) then
+ CASE WHEN (cw_user_tasks.locking_user_id = :userId) then
1
- when (cw_user_tasks.locking_user_id is null) then
+ WHEN (cw_user_tasks.locking_user_id is null) then
2
- else
+ ELSE
3
- END as status,
- cw_user_tasks.locking_user_id
- from cw_tasks,
- cw_user_tasks,
- cms_tasks,
- cms_task_types,
- cw_processes,
- cms_items,
- cms_pages
+ END as status,
+ cw_user_tasks.locking_user_id,
+ cw_tasks_proc.label as processLabel
+ from cw_tasks,
+ cw_user_tasks,
+ cms_tasks,
+ cms_task_types,
+ cw_processes,
+ cms_items,
+ cms_pages,
+ cw_tasks cw_tasks_proc
where cw_tasks.task_id = cw_user_tasks.task_id
and cw_user_tasks.task_id = cms_tasks.task_id
and cms_tasks.task_type_id = cms_task_types.task_type_id
@@ -76,6 +78,7 @@
and cw_tasks.parent_task_id = cw_processes.process_id
and cms_items.item_id = cw_processes.object_id
and cms_items.item_id = cms_pages.item_id
+ and cw_tasks_proc.task_id = cw_processes.process_id
and ( :userId in (select cw_task_user_assignees.user_id
from cw_task_user_assignees
where cw_task_user_assignees.task_id = cw_tasks.task_id)
@@ -85,7 +88,6 @@
in (select cw_task_group_assignees.group_id
from cw_task_group_assignees
where cw_task_group_assignees.task_id = cw_tasks.task_id)))
- order by status asc, due_date asc, cms_pages.title asc)
} map {
taskID = cw_tasks.task_id;
processID = cw_tasks.parent_task_id;
@@ -101,5 +103,6 @@
taskType = taskname;
taskTypeClass = cms_task_types.classname;
status = status;
+ processLabel = processLabel;
}
}
Modified: ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl
===================================================================
--- ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl 2005-08-22 14:49:42 UTC (rev 719)
+++ ccm-cms/trunk/pdl/com/arsdigita/content-section/query-getEnabledUserTasks.pg.pdl 2005-08-22 15:28:15 UTC (rev 720)
@@ -36,9 +36,9 @@
String taskType;
String taskTypeClass;
Integer status;
+ String processLabel;
do {
- select * from
- (select cw_tasks.task_id,
+ select cw_tasks.task_id,
cw_tasks.parent_task_id,
cw_tasks.label,
cw_tasks.description,
@@ -46,7 +46,7 @@
cms_task_types.name as taskname,
CASE WHEN (cw_user_tasks.is_locked is not null) THEN
( cw_user_tasks.is_locked )
- ELSE
+ ELSE
( 'f' )
END as is_locked,
cw_user_tasks.due_date,
@@ -56,19 +56,21 @@
cms_pages.title,
CASE WHEN (cw_user_tasks.locking_user_id = :userId) then
1
- WHEN (cw_user_tasks.locking_user_id is null) then
+ WHEN (cw_user_tasks.locking_user_id is null) then
2
- ELSE
+ ELSE
3
- END as status,
- cw_user_tasks.locking_user_id
+ END as status,
+ cw_user_tasks.locking_user_id,
+ cw_tasks_proc.label as processLabel
from cw_tasks,
cw_user_tasks,
cms_tasks,
cms_task_types,
cw_processes,
cms_items,
- cms_pages
+ cms_pages,
+ cw_tasks cw_tasks_proc
where cw_tasks.task_id = cw_user_tasks.task_id
and cw_user_tasks.task_id = cms_tasks.task_id
and cms_tasks.task_type_id = cms_task_types.task_type_id
@@ -76,16 +78,16 @@
and cw_tasks.parent_task_id = cw_processes.process_id
and cms_items.item_id = cw_processes.object_id
and cms_items.item_id = cms_pages.item_id
+ and cw_tasks_proc.task_id = cw_processes.process_id
and ( exists (select 1 from cw_task_user_assignees
where cw_task_user_assignees.user_id = :userId
and cw_task_user_assignees.task_id = cw_tasks.task_id)
- or
+ or
exists (select 1
from group_member_trans_map, cw_task_group_assignees
where :userId = member_id
and group_member_trans_map.group_id = cw_task_group_assignees.group_id
and cw_task_group_assignees.task_id = cw_tasks.task_id))
- order by status asc, due_date asc, cms_pages.title asc) results
} map {
taskID = cw_tasks.task_id;
processID = cw_tasks.parent_task_id;
@@ -101,5 +103,6 @@
taskType = taskname;
taskTypeClass = cms_task_types.classname;
status = status;
+ processLabel = processLabel;
}
}
Modified: ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java 2005-08-22 14:49:42 UTC (rev 719)
+++ ccm-cms/trunk/src/com/arsdigita/cms/ui/TasksPanel.java 2005-08-22 15:28:15 UTC (rev 720)
@@ -101,23 +101,24 @@
private Paginator m_paginator;
private ActionLink m_viewLockLink,m_viewUnlockLink,m_viewAllLockLink;
private Label m_viewLockLabel,m_viewUnlockLabel,m_viewAllLockLabel;
- private Label m_actionLabel;
private StringParameter m_sortDirectionParam;
private StringParameter m_sortTypeParam;
private StringParameter m_lockFilterParam;
// control link variable
- private static final String ACTION = "taskAction";
- private static final String SORT_ACTION_DOWN = "sortActionUp";
- private static final String SORT_ACTION_UP = "sortActionDown";
+ private static final String TASK_ACTION = "taskAction";
+ private static final String SORT_DOWN = "sortActionUp";
+ private static final String SORT_UP = "sortActionDown";
- public static final String LOCK_FILTER_TYPE = "lockFilterType";
- public static final String SORT_TYPE = "sortType";
- public static final String SORT_DIRECTION = "sortDirection";
- public static final String SORT_USER = "user";
- public static final String SORT_TITLE = "title";
- public static final String SORT_DATE = "date";
- public static final String SORT_STATUS = "status";
+ private static final String LOCK_FILTER_TYPE = "lockFilterType";
+ private static final String SORT_TYPE = "sortType";
+ private static final String SORT_DIRECTION = "sortDirection";
+ private static final String SORT_ACTION = "action";
+ private static final String SORT_DATE = "date";
+ private static final String SORT_STATUS = "status";
+ private static final String SORT_TITLE = "title";
+ private static final String SORT_USER = "user";
+ private static final String SORT_WORKFLOW = "workflow";
// IMAGES
public static final String UP_ARROW_IMAGE = "/assets/gray-triangle-up.gif";
@@ -262,8 +263,8 @@
add(getTasksList());
add(getPaginator());
- m_actionLabel = new Label(GlobalizationUtil.globalize("cms.ui.action"));
- m_actionLabel.setClassAttr("action");
+// m_actionLabel = new Label(GlobalizationUtil.globalize("cms.ui.action"));
+// m_actionLabel.setClassAttr("action");
}
public void register(Page p) {
@@ -286,13 +287,13 @@
String lockFilterType = getLockFilterType(state);
- if ( lockFilterType.equals("lock") ) {
- m_viewLockLabel.setVisible(state,true);
- m_viewLockLink.setVisible(state,false);
+ if ( lockFilterType.equals("all") ) {
+ m_viewLockLabel.setVisible(state,false);
+ m_viewLockLink.setVisible(state,true);
m_viewUnlockLabel.setVisible(state,false);
m_viewUnlockLink.setVisible(state,true);
- m_viewAllLockLabel.setVisible(state,false);
- m_viewAllLockLink.setVisible(state,true);
+ m_viewAllLockLabel.setVisible(state,true);
+ m_viewAllLockLink.setVisible(state,false);
} else if ( lockFilterType.equals("unlock") ) {
m_viewLockLabel.setVisible(state,false);
m_viewLockLink.setVisible(state,true);
@@ -300,13 +301,13 @@
m_viewUnlockLink.setVisible(state,false);
m_viewAllLockLabel.setVisible(state,false);
m_viewAllLockLink.setVisible(state,true);
- } else {
- m_viewLockLabel.setVisible(state,false);
- m_viewLockLink.setVisible(state,true);
+ } else { // default is "lock"
+ m_viewLockLabel.setVisible(state,true);
+ m_viewLockLink.setVisible(state,false);
m_viewUnlockLabel.setVisible(state,false);
m_viewUnlockLink.setVisible(state,true);
- m_viewAllLockLabel.setVisible(state,true);
- m_viewAllLockLink.setVisible(state,false);
+ m_viewAllLockLabel.setVisible(state,false);
+ m_viewAllLockLink.setVisible(state,true);
}
}
});
@@ -354,7 +355,7 @@
protected String getSortDirection(PageState state) {
String sortDirection = (String)state.getValue(m_sortDirectionParam);
if ( sortDirection == null ) {
- sortDirection = SORT_ACTION_UP;
+ sortDirection = SORT_UP;
}
return sortDirection;
}
@@ -453,8 +454,8 @@
private DataQuery makeQuery(PageState state) {
User user = (User)Kernel.getContext().getParty();
- DataQuery query = SessionManager.getSession().retrieveQuery
- ("com.arsdigita.cms.workflow.getEnabledUserTasks");
+ DataQuery query = SessionManager.getSession()
+ .retrieveQuery(QUERY_NAME);
addQueryFilters(query,user,state);
return query;
@@ -489,7 +490,7 @@
String sortKey = getSortType(state);
String sortDirection = getSortDirection(state);
String sortPostfix = " asc";
- if (sortDirection.equals(SORT_ACTION_DOWN)) {
+ if (sortDirection.equals(SORT_DOWN)) {
sortPostfix = " desc";
}
@@ -501,15 +502,25 @@
", lower(status) asc, lower(pageTitle) asc");
} else if ( sortKey.equals(SORT_USER) ) {
query.setOrder("lockingUserID " + sortPostfix +
- ", lower(status) asc, dueDate desc, " +
- " lower(pageTitle) asc");
+ ", lower(status) asc, dueDate desc " +
+ ", lower(pageTitle) asc");
} else if ( sortKey.equals(SORT_STATUS) ) {
query.setOrder("lower(status) " + sortPostfix +
- ", dueDate desc, " +
- " lower(pageTitle) asc");
+ ", dueDate desc " +
+ ", lower(pageTitle) asc");
- }
-
+ } else if ( sortKey.equals(SORT_ACTION) ) {
+ query.setOrder("taskType " + sortPostfix +
+ ", lower(status) asc, dueDate desc " +
+ ", lower(pageTitle) asc"
+ );
+ } else if ( sortKey.equals(SORT_WORKFLOW) ) {
+ query.setOrder("processLabel " + sortPostfix +
+ ", lower(status) asc, dueDate desc " +
+ ", lower(pageTitle) asc"
+ );
+ }
+
HashMap sections = new HashMap();
while (query.next()) {
@@ -536,6 +547,7 @@
task.addAttribute("processID", query.get("processID").toString());
task.addAttribute("taskLabel", (String)query.get("taskLabel"));
task.addAttribute("taskDescription", (String)query.get("taskDescription"));
+ task.addAttribute("processLabel", (String)query.get("processLabel"));
String isLocked = (String)query.get("isLocked");
task.addAttribute("isLocked", isLocked);
@@ -568,7 +580,7 @@
// control event for locking a task
try {
- state.setControlEvent(this, ACTION, itemID.toString());
+ state.setControlEvent(this, TASK_ACTION, itemID.toString());
task.addAttribute("actionURL", state.stateAsURL());
state.clearControlEvent();
} catch (java.io.IOException ex) {
@@ -582,26 +594,28 @@
}
}
- m_actionLabel.generateXML(state, content);
+ // m_actionLabel.generateXML(state, content);
String[][] sortableHeaders =
{{SORT_TITLE, "cms.ui.workflow.task.item_title"},
+ {SORT_ACTION, "cms.ui.action"},
{SORT_DATE, "cms.tasks.ui.due_date"},
{SORT_STATUS, "cms.tasks.ui.status_no_colon"},
- {SORT_USER, "cms.ui.workflow.task.locking_user"}};
+ {SORT_USER, "cms.ui.workflow.task.locking_user"},
+ {SORT_WORKFLOW, "cms.ui.workflow"}};
for (int i=0;i<sortableHeaders.length;i++) {
String header = sortableHeaders[i][0];
String labelKey = sortableHeaders[i][1];
- if (sortDirection.equals(SORT_ACTION_UP) && header.equals(sortKey)) {
- state.setControlEvent(this, SORT_ACTION_DOWN, header);
+ if (sortDirection.equals(SORT_UP) && header.equals(sortKey)) {
+ state.setControlEvent(this, SORT_DOWN, header);
} else {
- state.setControlEvent(this, SORT_ACTION_UP, header);
+ state.setControlEvent(this, SORT_UP, header);
}
SimpleContainer container = new SimpleContainer();
container.add(new Label(GlobalizationUtil.globalize(labelKey)));
if (header.equals(sortKey)) {
String imageURLStub = null;
- if (SORT_ACTION_UP.equals(sortDirection)) {
+ if (SORT_UP.equals(sortDirection)) {
imageURLStub = UP_ARROW_IMAGE;
} else {
imageURLStub = DOWN_ARROW_IMAGE;
@@ -622,7 +636,7 @@
public void respond(PageState state) throws ServletException {
String key = state.getControlEventName();
String value = state.getControlEventValue();
- if (ACTION.equals(key)) {
+ if (TASK_ACTION.equals(key)) {
BigDecimal itemID = new BigDecimal(value);
try {
@@ -655,12 +669,12 @@
} catch (DataObjectNotFoundException ex) {
throw new ServletException("Unknown content ID" + itemID);
}
- } else if ( SORT_ACTION_UP.equals(key) || SORT_ACTION_DOWN.equals(key)) {
+ } else if ( SORT_UP.equals(key) || SORT_DOWN.equals(key)) {
state.setValue(m_sortTypeParam, value);
- if (SORT_ACTION_DOWN.equals(key)) {
- state.setValue(m_sortDirectionParam, SORT_ACTION_DOWN);
+ if (SORT_DOWN.equals(key)) {
+ state.setValue(m_sortDirectionParam, SORT_DOWN);
} else {
- state.setValue(m_sortDirectionParam, SORT_ACTION_UP);
+ state.setValue(m_sortDirectionParam, SORT_UP);
}
} else {
throw new ServletException("Unknown control event: " + key);
Modified: ccm-cms/trunk/web/packages/content-section/xsl/content-center.xsl
===================================================================
--- ccm-cms/trunk/web/packages/content-section/xsl/content-center.xsl 2005-08-22 14:49:42 UTC (rev 719)
+++ ccm-cms/trunk/web/packages/content-section/xsl/content-center.xsl 2005-08-22 15:28:15 UTC (rev 720)
@@ -22,18 +22,12 @@
<table class="data">
<thead>
<tr>
- <th>
- <xsl:apply-templates select="bebop:link[@class='title']"/>
- </th>
- <th>
- <xsl:apply-templates select="bebop:label[@class='action']"/></th>
- <th>
- <xsl:apply-templates select="bebop:link[@class='date']"/>
- </th>
+ <th><xsl:apply-templates select="bebop:link[@class='title']"/></th>
+ <th><xsl:apply-templates select="bebop:link[@class='action']"/></th>
+ <th><xsl:apply-templates select="bebop:link[@class='date']"/></th>
<th><xsl:apply-templates select="bebop:link[@class='status']"/></th>
- <th>
- <xsl:apply-templates select="bebop:link[@class='user']"/>
- </th>
+ <th><xsl:apply-templates select="bebop:link[@class='user']"/></th>
+ <th><xsl:apply-templates select="bebop:link[@class='workflow']"/></th>
</tr>
</thead>
<tbody>
@@ -74,13 +68,12 @@
<td>
<xsl:choose>
<xsl:when test="@assignee">
- <xsl:value-of select="@assignee" />
- </xsl:when>
- <xsl:otherwise>
- --
- </xsl:otherwise>
+ <xsl:value-of select="@assignee"/>
+ </xsl:when>
+ <xsl:otherwise>--</xsl:otherwise>
</xsl:choose>
</td>
+ <td><xsl:value-of select="@processLabel"/></td>
</tr>
</xsl:for-each>
</tbody>
|
|
From: <ss...@vh...> - 2005-08-22 14:58:04
|
Author: sshinde
Date: 2005-08-22 16:49:42 +0200 (Mon, 22 Aug 2005)
New Revision: 719
Modified:
ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres-create.sql
ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres/upgrade/6.1.1-6.1.2/add-remote.sql
Log:
As promised in r688 , here is fix for the loading of data in postgres
with ccm load and the corresponding upgrade script.
Modified: ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres/upgrade/6.1.1-6.1.2/add-remote.sql
===================================================================
--- ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres/upgrade/6.1.1-6.1.2/add-remote.sql 2005-08-18 16:22:21 UTC (rev 718)
+++ ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres/upgrade/6.1.1-6.1.2/add-remote.sql 2005-08-22 14:49:42 UTC (rev 719)
@@ -4,4 +4,10 @@
alter table cms_form_item add constraint cms_form_item_remt_act_ck check (remote_action in ('0', '1'));
alter table cms_form_item add remote_url varchar(700);
+
+ alter table cms_form_item drop constraint CMS_FORM_ITEM_FRM_FK;
+
+ alter table cms_form_item add constraint CMS_FORM_ITEM_FORM_ID_F_FRZIF
+ foreign key (FORM_ID) references BEBOP_FORM_SECTIONS(FORM_SECTION_ID);
+
commit;
Modified: ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres-create.sql
===================================================================
--- ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres-create.sql 2005-08-18 16:22:21 UTC (rev 718)
+++ ccm-cms-types-formitem/trunk/sql/ccm-cms-types-formitem/postgres-create.sql 2005-08-22 14:49:42 UTC (rev 719)
@@ -20,7 +20,6 @@
\i ddl/postgres/create.sql
-\i default/content-section/table-cms_form_item.sql
\i default/content-section/index-cms_form_item.sql
\i ddl/postgres/deferred.sql
|
|
From: <ssk...@vh...> - 2005-08-18 19:35:15
|
Author: sskracic
Date: 2005-08-17 20:17:57 +0200 (Wed, 17 Aug 2005)
New Revision: 711
Modified:
ccm-cms/trunk/web/packages/content-section/xsl/types/FileAttachments.xsl
ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
Log:
Added support for file attachment ordering via user-supplied fileOrder sort key.
Modified: ccm-cms/trunk/web/packages/content-section/xsl/types/FileAttachments.xsl
===================================================================
--- ccm-cms/trunk/web/packages/content-section/xsl/types/FileAttachments.xsl 2005-08-17 18:16:39 UTC (rev 710)
+++ ccm-cms/trunk/web/packages/content-section/xsl/types/FileAttachments.xsl 2005-08-17 18:17:57 UTC (rev 711)
@@ -10,6 +10,7 @@
<xsl:template name="cms:fileAttachments">
<table border="0">
<xsl:for-each select="fileAttachments">
+ <xsl:sort select="fileOrder" data-type="number" />
<tr>
<td class="contentText">
<xsl:value-of select="name"/>
@@ -26,6 +27,7 @@
<xsl:template name="cms:fileAttachments_text" >
<xsl:for-each select="fileAttachments">
+ <xsl:sort select="fileOrder" data-type="number" />
<span class="contentText">
<xsl:value-of select="name"/>
</span>
Modified: ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl
===================================================================
--- ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-17 18:16:39 UTC (rev 710)
+++ ccm-ldn-aplaws/trunk/web/__ccm__/themes/aplaws/lib/lib.xsl 2005-08-17 18:17:57 UTC (rev 711)
@@ -251,6 +251,7 @@
<h2>Related Files:</h2>
<ul class="linklist">
<xsl:for-each select="cms:contentPanel/cms:item/fileAttachments">
+<xsl:sort select="fileOrder" data-type="number" />
<li>
<xsl:value-of select="name"/> -
<xsl:value-of select="description"/>
|
Author: sskracic Date: 2005-08-17 20:16:39 +0200 (Wed, 17 Aug 2005) New Revision: 710 Added: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/6.1.1-6.1.2/ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/6.1.1-6.1.2/add-file_order.sql ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/6.1.1-6.1.2/ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/6.1.1-6.1.2/add-file_order.sql ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/oracle-se-6.1.1-6.1.2.sql ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/postgres-6.1.1-6.1.2.sql Modified: ccm-cms-assets-fileattachment/trunk/application.xml ccm-cms-assets-fileattachment/trunk/pdl/com/arsdigita/cms/contentassets/FileAttachment.pdl ccm-cms-assets-fileattachment/trunk/src/ccm-cms-assets-fileattachment.upgrade ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachment.java ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentModelBuilder.java ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsTable.java Log: First stab at the file attachment ordering. Modified: ccm-cms-assets-fileattachment/trunk/application.xml =================================================================== --- ccm-cms-assets-fileattachment/trunk/application.xml 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/application.xml 2005-08-17 18:16:39 UTC (rev 710) @@ -2,12 +2,12 @@ <ccm:application xmlns:ccm="http://ccm.redhat.com/ccm-project" name="ccm-cms-assets-fileattachment" prettyName="Red Hat CMS Content Asset File Attachment" - version="6.1.1" + version="6.1.2" release="1" webapp="ROOT"> <ccm:dependencies> - <ccm:requires name="ccm-core" version="6.1.2"/> - <ccm:requires name="ccm-cms" version="6.1.2"/> + <ccm:requires name="ccm-core" version="6.1.1" relation="ge"/> + <ccm:requires name="ccm-cms" version="6.1.1" relation="ge"/> </ccm:dependencies> <ccm:directories> <ccm:directory name="pdl"/> Modified: ccm-cms-assets-fileattachment/trunk/pdl/com/arsdigita/cms/contentassets/FileAttachment.pdl =================================================================== --- ccm-cms-assets-fileattachment/trunk/pdl/com/arsdigita/cms/contentassets/FileAttachment.pdl 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/pdl/com/arsdigita/cms/contentassets/FileAttachment.pdl 2005-08-17 18:16:39 UTC (rev 710) @@ -19,11 +19,67 @@ import com.arsdigita.cms.ContentItem; object type FileAttachment extends FileAsset { + Integer[0..1] fileOrder = ca_file_attachments.file_order INTEGER; reference key (ca_file_attachments.file_id); aggressive load (fileOwner.id); } -association { +association { composite ContentItem[0..1] fileOwner = join ca_file_attachments.owner_id to cms_items.item_id; component FileAttachment[0..n] fileAttachments = join cms_items.item_id to ca_file_attachments.owner_id; } + +query maxFileAttachmentOrderForItem { + Integer fileOrder; + + options { + WRAP_QUERIES = false; + } + + do { + select max(cfa.file_order) as file_order from ca_file_attachments cfa + where cfa.owner_id = :ownerID + } map { + fileOrder = file_order; + } +} + +data operation swapFileAttachmentOrder { + do { + update ca_file_attachments + set file_order = CASE WHEN (file_order = :fileOrder) THEN + (:nextFileOrder) + ELSE + (:fileOrder) + END + where file_order in (:fileOrder, :nextFileOrder) + and owner_id = :ownerID + and 2 = (select count(*) from ca_file_attachments fa + where fa.file_order in (:fileOrder, :nextFileOrder) + and fa.owner_id = :ownerID) + } +} + +query getAdjacentSortKey { + Integer otherKey; + + options { + WRAP_QUERIES = false; + } + + do { + select CASE WHEN 'next' = :param THEN + (select min(file_order) from ca_file_attachments + where owner_id = :ownerID + and file_order > :fileOrder) + ELSE + (select max(file_order) from ca_file_attachments + where owner_id = :ownerID + and file_order < :fileOrder) + END AS other_key + from dual + } map { + otherKey = other_key; + } +} + Added: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/6.1.1-6.1.2/add-file_order.sql =================================================================== --- ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/6.1.1-6.1.2/add-file_order.sql 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/6.1.1-6.1.2/add-file_order.sql 2005-08-17 18:16:39 UTC (rev 710) @@ -0,0 +1,15 @@ +alter table ca_file_attachments add file_order integer; +-- update draft items first +update ca_file_attachments set + file_order = file_id + where file_id in (select master_id from cms_items); +-- now copy that ordering to the published items, so +-- that we get no inconsistencies in already published pages. +update ca_file_attachments cx set + file_order = (select c2.file_order from ca_file_attachments c2 + where c2.file_id = (select ci.master_id from cms_items ci + where ci.item_id = cx.file_id)) + where + file_id in (select ci2.item_id from cms_items ci2 where ci2.master_id is not null); +commit; + Property changes on: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/oracle-se/upgrade/6.1.1-6.1.2/add-file_order.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/6.1.1-6.1.2/add-file_order.sql =================================================================== --- ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/6.1.1-6.1.2/add-file_order.sql 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/6.1.1-6.1.2/add-file_order.sql 2005-08-17 18:16:39 UTC (rev 710) @@ -0,0 +1,15 @@ +begin; + alter table ca_file_attachments add file_order integer; + -- update draft items first + update ca_file_attachments set + file_order = file_id + where file_id in (select master_id from cms_items); + -- now copy that ordering to the published items, so + -- that we get no inconsistencies in already published pages. + update ca_file_attachments set + file_order = (select c2.file_order from ca_file_attachments c2 + where c2.file_id = (select ci.master_id from cms_items ci + where ci.item_id = ca_file_attachments.file_id)) + where + file_id in (select item_id from cms_items where master_id is not null); +commit; Property changes on: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/postgres/upgrade/6.1.1-6.1.2/add-file_order.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/oracle-se-6.1.1-6.1.2.sql =================================================================== --- ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/oracle-se-6.1.1-6.1.2.sql 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/oracle-se-6.1.1-6.1.2.sql 2005-08-17 18:16:39 UTC (rev 710) @@ -0,0 +1 @@ +@@ ../oracle-se/upgrade/6.1.1-6.1.2/add-file_order.sql Property changes on: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/oracle-se-6.1.1-6.1.2.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Added: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/postgres-6.1.1-6.1.2.sql =================================================================== --- ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/postgres-6.1.1-6.1.2.sql 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/postgres-6.1.1-6.1.2.sql 2005-08-17 18:16:39 UTC (rev 710) @@ -0,0 +1 @@ +\i ../postgres/upgrade/6.1.1-6.1.2/add-file_order.sql Property changes on: ccm-cms-assets-fileattachment/trunk/sql/ccm-cms-assets-fileattachment/upgrade/postgres-6.1.1-6.1.2.sql ___________________________________________________________________ Name: svn:keywords + Id Author URL Modified: ccm-cms-assets-fileattachment/trunk/src/ccm-cms-assets-fileattachment.upgrade =================================================================== --- ccm-cms-assets-fileattachment/trunk/src/ccm-cms-assets-fileattachment.upgrade 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/src/ccm-cms-assets-fileattachment.upgrade 2005-08-17 18:16:39 UTC (rev 710) @@ -2,4 +2,7 @@ <version from="6.0.1" to="6.1.0"> <script sql="ccm-cms-assets-fileattachment/upgrade/::database::-6.0.1-6.1.0.sql"/> </version> + <version from="6.1.1" to="6.1.2"> + <script sql="ccm-cms-assets-fileattachment/upgrade/::database::-6.1.1-6.1.2.sql"/> + </version> </upgrade> Modified: ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachment.java =================================================================== --- ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachment.java 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/FileAttachment.java 2005-08-17 18:16:39 UTC (rev 710) @@ -16,18 +16,19 @@ import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.FileAsset; -import com.arsdigita.domain.DataObjectNotFoundException; import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.kernel.permissions.PermissionService; import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.DataOperation; +import com.arsdigita.persistence.DataQuery; import com.arsdigita.persistence.OID; import com.arsdigita.persistence.Session; import com.arsdigita.persistence.SessionManager; import com.arsdigita.util.Assert; +import java.math.BigDecimal; import org.apache.log4j.Logger; -import java.math.BigDecimal; /** * Represents a FileAsset uploaded as one of N files attached to a content item * @@ -45,6 +46,7 @@ public static final String FILE_OWNER = "fileOwner"; public static final String FILE_ATTACHMENTS = "fileAttachments"; + public static final String FILE_ORDER = "fileOrder"; /** * Default constructor. This creates a new ProjectSupportBaseItem; @@ -130,17 +132,150 @@ setLanguage( fileOwner.getLanguage() ); } + public void setFileOrder(Integer order) { + set(FILE_ORDER, order); + } + + public void setFileOrder(int order) { + set(FILE_ORDER, new Integer(order)); + } + + public Integer getFileOrder() { + return (Integer) get(FILE_ORDER); + } + /** Retrieves attachments for a content item */ public static DataCollection getAttachments(ContentItem item) { - s_log.debug("Getting attachments for a content item"); + s_log.debug("Getting attachments for a content item: " + item); Session session = SessionManager.getSession(); DataCollection files = session.retrieve(BASE_DATA_OBJECT_TYPE); files.addEqualsFilter(FILE_OWNER + ".id", item.getID()); files.addEqualsFilter(IS_DELETED, "0"); - //files.addOrder(TITLE); + files.addOrder(FILE_ORDER); return files; } + /** + * This method is only used for setting initial sort keys for + * attachments which exist without them. This is called by swapKeys + * instead of attempting to swap if the key found is + * null. This implementation sorts all FileAttachments owned by this + * FileAttachment's "fileOwner" by file name. + */ + public void alphabetize() { + int sortKey = maxOrder(); + DataCollection attachments = getAttachments(getFileOwner()); + attachments.addOrder(NAME); + while (attachments.next()) { + sortKey++; + FileAttachment fa = new FileAttachment(attachments.getDataObject()); + fa.setFileOrder(sortKey); + fa.save(); + } + } + + /** + * Returns the max sort key value for all FileAttachments with the + * same file owner as this file. + * + * @return the max sort key value + */ + public int maxOrder() { + ContentItem fileOwner = getFileOwner(); + if (fileOwner == null) { + return 0; + } + int returnOrder = 0; + DataQuery query = SessionManager.getSession().retrieveQuery + ("com.arsdigita.cms.contentassets.maxFileAttachmentOrderForItem"); + query.setParameter("ownerID", fileOwner.getID()); + if (query.next()) { + Integer fileOrder = ((Integer)query.get("fileOrder")); + query.close(); + if (fileOrder != null) { + returnOrder = fileOrder.intValue(); + } + } + return returnOrder; + } + + + /** + * Swaps this <code>FileAttachment</code> with the next one, + * according to the fileOrder. + */ + public void swapWithNext() { + swapKeys(true); + } + + /** + * Swaps this <code>FileAttachment</code> with the previous one, + * according to the fileOrder. + */ + public void swapWithPrevious() { + swapKeys(false); + } + + /** + * This swaps the sort keys. + * @param swapNext This indicates if we are swapping with the next + * or the previous + */ + public void swapKeys(boolean swapNext) { + + Assert.assertTrue(!isNew(), "swapKeys() cannot be called on an " + + "object that is new"); + + ContentItem fileOwner = getFileOwner(); + Assert.assertNotNull(fileOwner, "fileOwner must be set for swapKeys() to work"); + + Integer currentKey = getFileOrder(); + // if the current item is not already ordered, alphabetize + // instead the first time. This is instead of having to deal + // with an upgrade script. + if (currentKey == null) { + alphabetize(); + return; + } + + // find out the other key which we're about to swap with + // if (next) otherkey = min(file_order) where file_order > currentKey; + // if (previous) otherkey = max(file_order) where file_order < currentKey; + + DataQuery query = SessionManager.getSession() + .retrieveQuery("com.arsdigita.cms.contentassets.getAdjacentSortKey"); + query.setParameter("ownerID", fileOwner.getID()); + query.setParameter("fileOrder", currentKey); + query.setParameter("param", swapNext ? "next" : "prev"); + + Integer otherKey = null; + + if (query.next()) { + otherKey = (Integer) query.get("otherKey"); + query.close(); + } else { + // the other key not found, something went wrong. + return; + } + + DataOperation operation = SessionManager.getSession() + .retrieveDataOperation("com.arsdigita.cms.contentassets.swapFileAttachmentOrder"); + operation.setParameter("ownerID", fileOwner.getID()); + operation.setParameter("fileOrder", currentKey); + operation.setParameter("nextFileOrder", otherKey); + operation.execute(); + + } + + + protected void beforeSave() { + super.beforeSave(); + if (getFileOrder() == null) { + setFileOrder(maxOrder()+1); + } + } + + protected void afterSave() { super.afterSave(); Modified: ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentModelBuilder.java =================================================================== --- ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentModelBuilder.java 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentModelBuilder.java 2005-08-17 18:16:39 UTC (rev 710) @@ -65,7 +65,7 @@ return m_table.isVisible(state); } - private static class FileAttachmentTableModel implements TableModel { + static class FileAttachmentTableModel implements TableModel { private DataCollection _collection; private FileAttachment _file; @@ -131,6 +131,10 @@ return _file.getID().toString(); } + public long size() { + return _collection.size(); + } + } } Modified: ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsTable.java =================================================================== --- ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsTable.java 2005-08-17 14:39:50 UTC (rev 709) +++ ccm-cms-assets-fileattachment/trunk/src/com/arsdigita/cms/contentassets/ui/FileAttachmentsTable.java 2005-08-17 18:16:39 UTC (rev 710) @@ -18,17 +18,20 @@ import com.arsdigita.bebop.ControlLink; import com.arsdigita.bebop.Link; import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.RequestLocal; import com.arsdigita.bebop.SimpleContainer; import com.arsdigita.bebop.Table; import com.arsdigita.bebop.table.TableCellRenderer; +import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ItemSelectionModel; +import com.arsdigita.cms.SecurityManager; import com.arsdigita.cms.contentassets.FileAttachment; import com.arsdigita.cms.dispatcher.Utilities; import com.arsdigita.domain.DataObjectNotFoundException; +import java.math.BigDecimal; +import javax.servlet.ServletException; import org.apache.log4j.Logger; -import javax.servlet.ServletException; -import java.math.BigDecimal; /** * * A Table for displaying File attachments @@ -40,16 +43,36 @@ public class FileAttachmentsTable extends Table { private static final Logger s_log = Logger.getLogger(FileAttachmentsTable.class); - public static final String[] s_tableHeaders = {"File", "Description", " "}; + public static final String[] s_tableHeaders = {"File", "Description", " ", " ", " "}; private static final String DELETE_EVENT = "delete"; + private static final String UP_EVENT = "up"; + private static final String DOWN_EVENT = "down"; private ItemSelectionModel m_model; + private RequestLocal m_size; + private RequestLocal m_editor; public FileAttachmentsTable(ItemSelectionModel model) { super(new FileAttachmentModelBuilder(model), s_tableHeaders); getColumn(0).setCellRenderer(new FileLinkCellRenderer()); getColumn(2).setCellRenderer(new MyCellRenderer()); + getColumn(3).setCellRenderer(new MoveUpLinkCellRenderer()); + getColumn(4).setCellRenderer(new MoveDownLinkCellRenderer()); m_model = model; + m_size = new RequestLocal(); + m_editor = new RequestLocal() { + public Object initialValue(PageState state) { + SecurityManager sm = Utilities.getSecurityManager(state); + ContentItem item = (ContentItem) m_model + .getSelectedObject(state); + Boolean val = new Boolean(sm.canAccess( + state.getRequest(), + SecurityManager.EDIT_ITEM, + item + )); + return val; + } + }; setWidth("100%"); } @@ -58,58 +81,142 @@ public void respond(PageState state) throws ServletException { String event = state.getControlEventName(); - if (DELETE_EVENT.equals(event)) { - String value = state.getControlEventValue(); + if (Boolean.TRUE.equals(m_editor.get(state))) { + if (DELETE_EVENT.equals(event)) { + String value = state.getControlEventValue(); - try { - FileAttachment attachment = - new FileAttachment(new BigDecimal(value)); - attachment.delete(); - } catch (DataObjectNotFoundException e) { - e.printStackTrace(); + try { + FileAttachment attachment = + new FileAttachment(new BigDecimal(value)); + attachment.delete(); + } catch (DataObjectNotFoundException e) { + e.printStackTrace(); + } + } else if (UP_EVENT.equals(event)) { + String value = state.getControlEventValue(); + try { + FileAttachment attachment = + new FileAttachment(new BigDecimal(value)); + attachment.swapWithPrevious(); + } catch (DataObjectNotFoundException e) { + e.printStackTrace(); + } + } else if (DOWN_EVENT.equals(event)) { + String value = state.getControlEventValue(); + try { + FileAttachment attachment = + new FileAttachment(new BigDecimal(value)); + attachment.swapWithNext(); + } catch (DataObjectNotFoundException e) { + e.printStackTrace(); + } } } } private class MyCellRenderer implements TableCellRenderer { - public Component getComponent(final Table table, - PageState state, - Object value, - boolean isSelected, - Object key, - int row, + public Component getComponent(final Table table, + PageState state, + Object value, + boolean isSelected, + Object key, + int row, int column) { SimpleContainer sc = new SimpleContainer(); final String modKey = (String)key; - ControlLink delLink = new ControlLink("Delete") { - public void setControlEvent(PageState s) { - s.setControlEvent(table, DELETE_EVENT, modKey); - } - }; - sc.add(delLink); + if (Boolean.TRUE.equals(m_editor.get(state))) { + ControlLink delLink = new ControlLink("Delete") { + public void setControlEvent(PageState s) { + s.setControlEvent(table, DELETE_EVENT, modKey); + } + }; + sc.add(delLink); + } return sc; } } + + + private class MoveUpLinkCellRenderer implements TableCellRenderer { + public Component getComponent(final Table table, + PageState state, + Object value, + boolean isSelected, + Object key, + int row, + int column) { + boolean isFirst = (row == 0); + SimpleContainer sc = new SimpleContainer(); + + final String modKey = (String)key; + + if (!isFirst && Boolean.TRUE.equals(m_editor.get(state))) { + ControlLink delLink = new ControlLink("up") { + public void setControlEvent(PageState s) { + s.setControlEvent(table, UP_EVENT, modKey); + } + }; + sc.add(delLink); + } + return sc; + + } + } + + + private class MoveDownLinkCellRenderer implements TableCellRenderer { + public Component getComponent(final Table table, + PageState state, + Object value, + boolean isSelected, + Object key, + int row, + int column) { + if (m_size.get(state) == null) { + m_size.set(state, + new Long(((FileAttachmentModelBuilder.FileAttachmentTableModel) + table.getTableModel(state)).size())); + } + boolean isLast = (row == ((Long)m_size.get(state)).intValue() - 1); + SimpleContainer sc = new SimpleContainer(); + + final String modKey = (String)key; + + if (!isLast && Boolean.TRUE.equals(m_editor.get(state))) { + ControlLink delLink = new ControlLink("down") { + public void setControlEvent(PageState s) { + s.setControlEvent(table, DOWN_EVENT, modKey); + } + }; + sc.add(delLink); + } + + return sc; + + } + } + + private class FileLinkCellRenderer implements TableCellRenderer{ - public Component getComponent(final Table table, - PageState state, - Object value, - boolean isSelected, + public Component getComponent(final Table table, + PageState state, + Object value, + boolean isSelected, Object key, - int row, + int row, int column) { SimpleContainer filesc = new SimpleContainer(); final String downloadKey = (String)key; - FileAttachment attachment = + FileAttachment attachment = new FileAttachment(new BigDecimal(downloadKey)); - Link downloadLink = new Link(attachment.getDisplayName(), + Link downloadLink = new Link(attachment.getDisplayName(), Utilities.getAssetURL(attachment)); filesc.add(downloadLink); - + return filesc; } } |
18 messages has been excluded from this view by a project administrator.
