openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r417856 [1/22] - in /incubator/openjpa/trunk/openjpa-lib: java/ main/ main/java/ main/java/org/apache/openjpa/lib/ant/ main/java/org/apache/openjpa/lib/conf/ main/java/org/apache/openjpa/lib/jdbc/ main/java/org/apache/openjpa/lib/log/ main/...
Date Wed, 28 Jun 2006 19:34:40 GMT
Author: pcl
Date: Wed Jun 28 12:34:33 2006
New Revision: 417856

URL: http://svn.apache.org/viewvc?rev=417856&view=rev
Log:
restructuring for maven; adding some more utility code. This is part 1 of a two-part commit,
since I didn't put enough directory structures in place just yet and svn complained and I'm
an svn newbie afraid to tempt the gods of source control.

Added:
    incubator/openjpa/trunk/openjpa-lib/main/
    incubator/openjpa/trunk/openjpa-lib/main/java/
      - copied from r415364, incubator/openjpa/trunk/openjpa-lib/java/
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/package.html
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/EventManager.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/LRUMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ReferenceHashMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ReferenceHashSet.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ReferenceMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/SizedMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/AbstractCollection.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/AbstractConcurrentEventManager.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/AbstractQueue.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/AbstractSet.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/Arrays.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentHashMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentHashSet.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentLinkedQueue.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashMap.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ConcurrentReferenceHashSet.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/CondVar.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/Condition.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/CopyOnWriteArrayList.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/CopyOnWriteArraySet.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/FIFOCondVar.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/FIFOWaitQueue.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/Lock.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/NanoTimer.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/Queue.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/ReentrantLock.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/TimeUnit.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/Utils.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/WaitQueue.java
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/concurrent/package.html
  (with props)
    incubator/openjpa/trunk/openjpa-lib/main/resources/
      - copied from r415364, incubator/openjpa/trunk/openjpa-lib/resources/
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/ant/
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/ant/localizer.properties
  (with props)
Removed:
    incubator/openjpa/trunk/openjpa-lib/java/
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/ConnectionRequestInfo.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/EfficientEmptyReferenceMap.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ExpirationNotifyingReferenceMap.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ReferenceSet.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ThreadLock.java
    incubator/openjpa/trunk/openjpa-lib/resources/
Modified:
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configurable.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configuration.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/ConfigurationImpl.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/ConfigurationProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configurations.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/DoubleValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/FileValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/GenericConfigurable.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/IntValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/MapConfigurationProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/ObjectValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/PluginListValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/PluginValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/StringListValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/StringValue.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Value.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/ValueListener.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/package.html
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/AbstractJDBCListener.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/ConfiguringConnectionDecorator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/ConnectionDecorator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DataSourceLogs.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DecoratingDataSource.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingCallableStatement.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingConnection.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingDataSource.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingDatabaseMetaData.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingPreparedStatement.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingResultSet.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/DelegatingStatement.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/JDBCEvent.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/JDBCEventConnectionDecorator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/JDBCListener.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/LoggingConnectionDecorator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/ReportingSQLException.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/jdbc/package.html
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/AbstractLog.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/CommonsLogFactory.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/Log.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/Log4JLogFactory.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/LogFactory.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/LogFactoryAdapter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/LogFactoryImpl.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/LogOutputStream.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/MultiLogFactory.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/NoneLogFactory.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/log/package.html
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/CFMetaDataParser.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/CFMetaDataSerializer.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ClassAnnotationMetaDataFilter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ClassArgParser.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ClasspathMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/FileMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/MetaDataFilter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/MetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/MetaDataIteratorChain.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/MetaDataParser.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/MetaDataSerializer.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ResourceMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/SourceTracker.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/SourceTrackers.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/SuffixMetaDataFilter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/URLMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/XMLMetaDataSerializer.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ZipFileMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/ZipStreamMetaDataIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/meta/package.html
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/AbstractListIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/AbstractNonSequentialResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/AbstractResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/AbstractSequentialResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/EagerResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/LazyForwardResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/ListResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/ListResultObjectProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/MergedResultObjectProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/RandomAccessResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/RangeResultObjectProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/ResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/ResultListIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/ResultObjectProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/ResultObjectProviderIterator.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/SimpleResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/SoftRandomAccessResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/WindowResultList.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/rop/package.html
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/AbstractEventManager.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/Base16Encoder.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/BytecodeWriter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/Closeable.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/CodeFormat.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/Files.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/FormatPreservingProperties.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/JavaVersions.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/Localizer.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/MultiClassLoader.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/Options.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ParameterTemplate.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ParseException.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ResourceBundleProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/Services.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/SimpleRegex.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/SimpleResourceBundleProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/StreamResourceBundleProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/StringDistance.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/TypedProperties.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/ZipResourceBundleProvider.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/util/package.html
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/Commentable.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/DocTypeReader.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/Location.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/ValidatingErrorHandler.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/XMLFactory.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/XMLWriter.java
    incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/xml/package.html
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/conf/localizer.properties
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/jdbc/localizer.properties
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/log/localizer.properties
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/meta/localizer.properties
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/rop/localizer.properties
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/util/localizer.properties
    incubator/openjpa/trunk/openjpa-lib/main/resources/org/apache/openjpa/lib/xml/localizer.properties

Added: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/AbstractTask.java?rev=417856&view=auto
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
(added)
+++ incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
Wed Jun 28 12:34:33 2006
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*********************************************************************
+
+**********************************************************************/
+package org.apache.openjpa.lib.ant;
+
+import org.apache.openjpa.lib.conf.*;
+import org.apache.openjpa.lib.util.*;
+
+import org.apache.tools.ant.*;
+import org.apache.tools.ant.taskdefs.*;
+import org.apache.tools.ant.types.*;
+import org.apache.tools.ant.util.*;
+
+import java.io.*;
+
+import java.util.*;
+
+
+/**
+ *  <p>Ant tasks all have a nested <code>&lt;config&rt;</code>
tag, which uses
+ *  the configuration as a bean-like task. E.g., you can do:
+ *  <p>
+ *  <code>
+ *  &lt;mytask&rt;<br />
+ *  &nbsp;&nbsp;&lt;config licenseKey="key" connectionUserName="foo"/&rt;<br
/>
+ *  &lt;/mytask&rt;
+ *  </code></p>
+ *
+ *  <p>The defailt configuration for the system will be used if the
+ *  <code>&lt;config&rt;</code> subtask is excluded.</p>
+ *
+ *  @nojavadoc */
+public abstract class AbstractTask extends MatchingTask {
+    static final Localizer _loc = Localizer.forPackage(AbstractTask.class);
+    protected List fileSets = new ArrayList();
+    protected boolean haltOnError = true;
+    protected Path classpath = null;
+    protected boolean useParent = false;
+    protected boolean isolate = false;
+    private Configuration _conf = null;
+    private AntClassLoader _cl = null;
+
+    /**
+     *  Set whether we want the task to ignore all errors.
+     */
+    public void setHaltOnError(boolean haltOnError) {
+        this.haltOnError = haltOnError;
+    }
+
+    /**
+     *  Whether we want the ClassLoader to be isolated from
+     *  all other ClassLoaders
+     */
+    public void setIsolate(boolean isolate) {
+        this.isolate = isolate;
+    }
+
+    /**
+     *  Whether we want to delegate to the parent ClassLoader
+     *  for resolveing classes. This may "taint" classes.
+     */
+    public void setUseParentClassloader(boolean useParent) {
+        this.useParent = useParent;
+    }
+
+    /**
+     *  The task configuration.
+     */
+    public Configuration getConfiguration() {
+        if (_conf == null) {
+            _conf = newConfiguration();
+        }
+
+        return _conf;
+    }
+
+    /**
+     *  Implement this method to return a configuration object for the
+     *  product in use.
+     */
+    protected abstract Configuration newConfiguration();
+
+    /**
+     *  Perform the task action on the given files.
+     */
+    protected abstract void executeOn(String[] files) throws Exception;
+
+    /**
+     *  Return the classloader to use.
+     */
+    protected ClassLoader getClassLoader() {
+        if (_cl != null) {
+            return _cl;
+        }
+
+        if (classpath != null) {
+            _cl = new AntClassLoader(project, classpath, useParent);
+        } else {
+            _cl = new AntClassLoader(project.getCoreLoader(), project,
+                    new Path(project), useParent);
+        }
+
+        _cl.setIsolated(isolate);
+
+        return _cl;
+    }
+
+    /**
+     *  Helper method to throw a standard exception if the task is not given
+     *  any files to execute on.  Implementations might call this method as
+     *  the first step in {@link #executeOn} to validate that they are given
+     *  files to work on.
+     */
+    protected void assertFiles(String[] files) {
+        if (files.length == 0) {
+            throw new BuildException(_loc.get("no-filesets"));
+        }
+    }
+
+    public void setClasspath(Path classPath) {
+        createClasspath().append(classPath);
+    }
+
+    public Path createClasspath() {
+        if (classpath == null) {
+            classpath = new Path(project);
+        }
+
+        return classpath.createPath();
+    }
+
+    public Object createConfig() {
+        return getConfiguration();
+    }
+
+    public void addFileset(FileSet set) {
+        fileSets.add(set);
+    }
+
+    public void execute() throws BuildException {
+        String[] files = getFiles();
+
+        try {
+            executeOn(files);
+        } catch (Throwable e) {
+            e.printStackTrace();
+
+            if (haltOnError) {
+                throw new BuildException(e);
+            }
+        } finally {
+            if (_conf != null) {
+                _conf.close();
+            }
+
+            _conf = null;
+        }
+    }
+
+    private String[] getFiles() {
+        List files = new ArrayList();
+
+        for (Iterator i = fileSets.iterator(); i.hasNext();) {
+            FileSet fs = (FileSet) i.next();
+            DirectoryScanner ds = fs.getDirectoryScanner(project);
+
+            String[] dsFiles = ds.getIncludedFiles();
+
+            for (int j = 0; j < dsFiles.length; j++) {
+                File f = new File(dsFiles[j]);
+
+                if (!f.isFile()) {
+                    f = new File(ds.getBasedir(), dsFiles[j]);
+                }
+
+                files.add(f.getAbsolutePath());
+            }
+        }
+
+        return (String[]) files.toArray(new String[files.size()]);
+    }
+}

Propchange: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/AbstractTask.java
------------------------------------------------------------------------------
    svn:executable = *

Added: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/package.html
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/package.html?rev=417856&view=auto
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/package.html
(added)
+++ incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/package.html
Wed Jun 28 12:34:33 2006
@@ -0,0 +1,11 @@
+<!--
+
+-->
+<html>
+<body>
+	<p><strong>Ant Integration</strong></p>
+	<p>
+		This package provides a foundation for basic Ant support.
+	</p>
+</body>
+</html>

Propchange: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/ant/package.html
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/BooleanValue.java?rev=417856&r1=415364&r2=417856&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
(original)
+++ incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/BooleanValue.java
Wed Jun 28 12:34:33 2006
@@ -17,67 +17,54 @@
 
 
 /**
- *	A boolean {@link Value}.
+ *  A boolean {@link Value}.
  *
- *	@author	Marc Prud'hommeaux
+ *  @author Marc Prud'hommeaux
  */
-public class BooleanValue
-	extends Value
-{
- 	private boolean value;
-
-
-	public BooleanValue (String prop)
-	{
-		super (prop);
-		setAliasListComprehensive (true);
-	}
-
-
-	public Class getValueType ()
-	{
-		return boolean.class;
-	}
-
-
-	/**
-	 *	The internal value.
-	 */
-	public void set (boolean value)
-	{
-		boolean oldValue = this.value;
-		this.value = value;
-		if (oldValue != value)
-			valueChanged ();
-	}
-
-
-	/**
-	 *	The internal value.
-	 */
-	public boolean get ()
-	{
-		return value;
-	}
-
-
-	protected String getInternalString ()
-	{
-		return String.valueOf (value);
-	}
-
-
-	protected void setInternalString (String val)
-	{
-		set (Boolean.valueOf (val).booleanValue ());
-	}
-
-
-	protected void setInternalObject (Object obj)
-	{
-		if (obj == null)
-			set (false);
-		else
-			set (((Boolean) obj).booleanValue ());
-	}
+public class BooleanValue extends Value {
+    private boolean value;
+
+    public BooleanValue(String prop) {
+        super(prop);
+        setAliasListComprehensive(true);
+    }
+
+    public Class getValueType() {
+        return boolean.class;
+    }
+
+    /**
+     *  The internal value.
+     */
+    public void set(boolean value) {
+        boolean oldValue = this.value;
+        this.value = value;
+
+        if (oldValue != value) {
+            valueChanged();
+        }
+    }
+
+    /**
+     *  The internal value.
+     */
+    public boolean get() {
+        return value;
+    }
+
+    protected String getInternalString() {
+        return String.valueOf(value);
+    }
+
+    protected void setInternalString(String val) {
+        set(Boolean.valueOf(val).booleanValue());
+    }
+
+    protected void setInternalObject(Object obj) {
+        if (obj == null) {
+            set(false);
+        } else {
+            set(((Boolean) obj).booleanValue());
+        }
+    }
 }

Modified: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configurable.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configurable.java?rev=417856&r1=415364&r2=417856&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configurable.java
(original)
+++ incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configurable.java
Wed Jun 28 12:34:33 2006
@@ -17,29 +17,26 @@
 
 
 /**
- *	<p>This interface provides a mechanism for notifying interested
- *	objects when configuration events occur. It provides an object
- *	with the opportunity to set itself up for configuration and to
- *	perform any necessary post-configuration.</p>
+ *  <p>This interface provides a mechanism for notifying interested
+ *  objects when configuration events occur. It provides an object
+ *  with the opportunity to set itself up for configuration and to
+ *  perform any necessary post-configuration.</p>
  *
- *	@author	Patrick Linskey
+ *  @author Patrick Linskey
  */
-public interface Configurable
-{
-	/**
-	 *	Invoked prior to setting bean properties. 
-	 */
-	public void setConfiguration (Configuration conf);
+public interface Configurable {
+    /**
+     *  Invoked prior to setting bean properties.
+     */
+    public void setConfiguration(Configuration conf);
 
+    /**
+     *  Invoked before bean property configuration is begun on this object.
+     */
+    public void startConfiguration();
 
-	/**
-	 *	Invoked before bean property configuration is begun on this object.
-	 */
-	public void startConfiguration ();
-
-
-	/**
-	 *	Invoked upon completion of bean property configuration for this object.
-	 */
-	public void endConfiguration ();
+    /**
+     *  Invoked upon completion of bean property configuration for this object.
+     */
+    public void endConfiguration();
 }

Modified: incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configuration.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configuration.java?rev=417856&r1=415364&r2=417856&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configuration.java
(original)
+++ incubator/openjpa/trunk/openjpa-lib/main/java/org/apache/openjpa/lib/conf/Configuration.java
Wed Jun 28 12:34:33 2006
@@ -15,185 +15,191 @@
  */
 package org.apache.openjpa.lib.conf;
 
+import org.apache.openjpa.lib.log.*;
+import org.apache.openjpa.lib.util.Closeable;
 
 import java.beans.*;
+
 import java.io.*;
-import java.util.*;
 
-import org.apache.openjpa.lib.log.*;
-import org.apache.openjpa.lib.util.Closeable; 
+import java.util.*;
 
 
 /**
- *	<p>Interface for generic configuration objects.  Includes the ability
- *	to write configuration to and from {@link Properties} instances.</p>
+ *  <p>Interface for generic configuration objects.  Includes the ability
+ *  to write configuration to and from {@link Properties} instances.  Instances
+ *  are threadsafe for reads, but not for writes.</p>
  *
- *	@author Marc Prud'hommeaux
- *	@author Abe White
+ *  @author Marc Prud'hommeaux
+ *  @author Abe White
  */
-public interface Configuration
-	extends BeanInfo, Serializable, Closeable, Cloneable
-{
-	/**
-	 *	Attribute of returned {@link Value} property descriptors listing 
-	 *	recognized values for the property.
-	 */
-	public static final String ATTRIBUTE_ALLOWED_VALUES = "allowedValues";
-
-	/**
-	 *	Attribute of the returned {@link Value} property descriptors naming 
-	 *	the property's type or category.
-	 */	
-	public static final String ATTRIBUTE_TYPE = "propertyType";
-
-	/**
-	 *	Attribute of the returned {@link Value} property descriptors naming 
-	 *	the property' hierarchical category.
-	 */	
-	public static final String ATTRIBUTE_CATEGORY = "propertyCategory";
-
-	/**
-	 *	Attribute of the returned {@link Value} property descriptors naming 
-	 *	the property's ordering in its category.
-	 */	
-	public static final String ATTRIBUTE_ORDER = "propertyCategoryOrder";
-
-
-	/**
-	 *	Return the product name.  Defaults to <code>solarmetric</code>.
-	 */
-	public String getProductName ();
-
-
-	/**
-	 *	The log factory. If no log factory has been set explicitly,
- 	 *	this method will create one.
-	 */
-	public LogFactory getLogFactory ();
-
-
-	/**
-	 * 	 The log factory.
-	 */
-	public void setLogFactory (LogFactory factory);
-
-
-	/**
-	 *	Log plugin setting.
-	 */
-	public String getLog ();
-
-
-	/**
-	 *	Log plugin setting.
-	 */
-	public void setLog (String log);
-
-
-	/**
-	 *	Return the log for the given category.
-	 *
-	 *	@see	#getLogFactory
-	 */
-	public Log getLog (String category);
-
-
-	/**
-	 *	Return the log to use for configuration messages.
-	 */
-	public Log getConfigurationLog ();
-
-
-	/**
-	 *	Return the log to use for management messages.
-	 */
-	public Log getManagementLog ();
-
-
-	/**
-	 *	Return the log to use for profiling messages.
-	 */
-	public Log getProfilingLog ();
-
-
-	/**
-	 *	Return the {@link Value} for the given property, or null if none.
-	 */
-	public Value getValue (String property);
-
-
-	/**
-	 *	Return the set of all {@link Value}s.
-	 */
-	public Value[] getValues ();
-
-
-	/**
-	 *	A properties representation of this Configuration.
-	 *	Note that changes made to this properties object will
-	 *	not be automatically reflected in this Configuration object.
-	 *
-	 *	@param storeDefaults if true, then properties will be written
-	 * 						out even if they match the default value
-	 * 						for a property
-	 */
-	public Properties toProperties (boolean storeDefaults);
-
-
-	/**
-	 *	Set this Configuration via the given map.  Any keys missing from
-	 *	the given map will not be set. Note that changes made to this map 
-	 *	will not be automatically reflected in this Configuration object.
-	 *
-	 *	IMPORTANT: If the map contains instantiated objects (rather than 
-	 *	string values), only the string representation of those objects
-	 *	are considered in this configuration's <code>equals</code> and 
-	 *	<code>hashCode</code> methods.   If the object's property has no
-	 *	string form (such as an {@link ObjectValue}), the object is not
-	 *	part of the equality and hashing calculations.
-	 */
-	public void fromProperties (Map map);
-
-
-	/** 
-	 *  Adds a listener for any property changes.  The property events fired
-	 * 	will <b>not</b> include the old value.
-	 *  
-	 *  @param  listener  	the listener to receive notification
-	 *  					of property changes
-	 */
-	public void addPropertyChangeListener (PropertyChangeListener listener);
-
-
-	/** 
-	 *  Removes a listener for any property changes.
-	 *  
-	 *  @param  listener  the listener to remove
-	 */
-	public void removePropertyChangeListener (PropertyChangeListener listener);
-
-
-	/**
-	 *	Lock down the configuration's state.  Attempting to set state on a
-	 *	read-only configuration results in an exception.
-	 */
-	public void setReadOnly (boolean readOnly);
-
-
-	/**
-	 *	Return true if this configuration is immutable.
-	 */
-	public boolean isReadOnly ();
-
-
-	/**
-	 *	Free the resources used by this object.
-	 */
-	public void close ();
-
-
-	/**
-	 *	Return a copy of this configuration.
-	 */
-	public Object clone ();
+public interface Configuration extends BeanInfo, Serializable, Closeable,
+    Cloneable {
+    /**
+     *  Attribute of returned {@link Value} property descriptors listing
+     *  recognized values for the property.
+     */
+    public static final String ATTRIBUTE_ALLOWED_VALUES = "allowedValues";
+
+    /**
+     *  Attribute of the returned {@link Value} property descriptors naming
+     *  the property's type or category.
+     */
+    public static final String ATTRIBUTE_TYPE = "propertyType";
+
+    /**
+     *  Attribute of the returned {@link Value} property descriptors naming
+     *  the property' hierarchical category.
+     */
+    public static final String ATTRIBUTE_CATEGORY = "propertyCategory";
+
+    /**
+     *  Attribute of the returned {@link Value} property descriptors naming
+     *  the property's ordering in its category.
+     */
+    public static final String ATTRIBUTE_ORDER = "propertyCategoryOrder";
+
+    /**
+     *  Attribute of the returned {@link Value} property descriptors naming
+     *  the interface that plugin values for this property must implement.
+     */
+    public static final String ATTRIBUTE_INTERFACE = "propertyInterface";
+
+    /**
+     *  Return the product name.  Defaults to <code>solarmetric</code>.
+     */
+    public String getProductName();
+
+    /**
+     *  The log factory. If no log factory has been set explicitly,
+      *  this method will create one.
+     */
+    public LogFactory getLogFactory();
+
+    /**
+     *   The log factory.
+     */
+    public void setLogFactory(LogFactory factory);
+
+    /**
+     *  Log plugin setting.
+     */
+    public String getLog();
+
+    /**
+     *  Log plugin setting.
+     */
+    public void setLog(String log);
+
+    /**
+     *  Return the log for the given category.
+     *
+     *  @see #getLogFactory
+     */
+    public Log getLog(String category);
+
+    /**
+     *  Return the log to use for configuration messages.
+     */
+    public Log getConfigurationLog();
+
+    /**
+     *  Return the log to use for management messages.
+     */
+    public Log getManagementLog();
+
+    /**
+     *  Return the log to use for profiling messages.
+     */
+    public Log getProfilingLog();
+
+    /**
+     *  Return the {@link Value} for the given property, or null if none.
+     */
+    public Value getValue(String property);
+
+    /**
+     *  Return the set of all {@link Value}s.
+     */
+    public Value[] getValues();
+
+    /**
+     *  Add the given value to the set of configuration properties.  This
+     *  method replaces any existing value under the same property.
+     */
+    public Value addValue(Value val);
+
+    /**
+     *  Remove the given value from the set of configuration properties.
+     */
+    public boolean removeValue(Value val);
+
+    /**
+     *  A properties representation of this Configuration.
+     *  Note that changes made to this properties object will
+     *  not be automatically reflected in this Configuration object.
+     *
+     *  @param storeDefaults if true, then properties will be written
+     *                                          out even if they match the default value
+     *                                          for a property
+     */
+    public Map toProperties(boolean storeDefaults);
+
+    /**
+     *  Set this Configuration via the given map.  Any keys missing from
+     *  the given map will not be set. Note that changes made to this map
+     *  will not be automatically reflected in this Configuration object.
+     *
+     *  IMPORTANT: If the map contains instantiated objects (rather than
+     *  string values), only the string representation of those objects
+     *  are considered in this configuration's <code>equals</code> and
+     *  <code>hashCode</code> methods.   If the object's property has no
+     *  string form (such as an {@link ObjectValue}), the object is not
+     *  part of the equality and hashing calculations.
+     */
+    public void fromProperties(Map map);
+
+    /**
+     *  Adds a listener for any property changes.  The property events fired
+     *  will <b>not</b> include the old value.
+     *
+     *  @param listener          the listener to receive notification
+     *                                          of property changes
+     */
+    public void addPropertyChangeListener(PropertyChangeListener listener);
+
+    /**
+     *  Removes a listener for any property changes.
+     *
+     *  @param listener  the listener to remove
+     */
+    public void removePropertyChangeListener(PropertyChangeListener listener);
+
+    /**
+     *  Lock down the configuration's state.  Attempting to set state on a
+     *  read-only configuration results in an exception.
+     */
+    public void setReadOnly(boolean readOnly);
+
+    /**
+     *  Return true if this configuration is immutable.
+     */
+    public boolean isReadOnly();
+
+    /**
+     *  Call the instantiating get methods for all values.  Up-front
+     *  instantiation allows one to avoid the synchronization necessary with
+     *  lazy instantiation.
+     */
+    public void instantiateAll();
+
+    /**
+     *  Free the resources used by this object.
+     */
+    public void close();
+
+    /**
+     *  Return a copy of this configuration.
+     */
+    public Object clone();
 }



Mime
View raw message