You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by fr...@apache.org on 2014/07/04 16:27:48 UTC
svn commit: r1607865 - in /empire-db/trunk: ./ empire-db-codegen/
empire-db-dist/ empire-db-examples/
empire-db-examples/empire-db-example-advanced/
empire-db-examples/empire-db-example-basic/
empire-db-examples/empire-db-example-codegen/ empire-db-exa...
Author: francisdb
Date: Fri Jul 4 14:27:47 2014
New Revision: 1607865
URL: http://svn.apache.org/r1607865
Log:
fix EMPIREDB-127 Switch to apache maven 3.0.x
Modified:
empire-db/trunk/ (props changed)
empire-db/trunk/empire-db/ (props changed)
empire-db/trunk/empire-db-codegen/ (props changed)
empire-db/trunk/empire-db-dist/pom.xml
empire-db/trunk/empire-db-examples/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-advanced/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-basic/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-codegen/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml
empire-db/trunk/empire-db-examples/empire-db-example-cxf/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-jsf2/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-spring/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-struts2/ (props changed)
empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/ (props changed)
empire-db/trunk/empire-db-jsf2/ (props changed)
empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java
empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java
empire-db/trunk/empire-db-maven-plugin/ (props changed)
empire-db/trunk/empire-db-maven-plugin/pom.xml
empire-db/trunk/empire-db-maven-plugin/src/main/java/org/apache/empire/db/maven/CodeGenMojo.java
empire-db/trunk/empire-db-struts2/ (props changed)
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/ActionErrorProvider.java
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionError.java
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/BeanActionSupport.java
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordFormActionSupport.java
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/exceptions/WebException.java
empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/DefaultWebRequest.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Attributes.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/DataType.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpressionIndex.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/HSqlDDLGenerator.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDDLGenerator.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/PostgreDDLGenerator.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireException.java
empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireFileException.java
empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/AttributesTest.java
empire-db/trunk/pom.xml
Propchange: empire-db/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,5 @@
.project
target
+.idea
+*.iml
Propchange: empire-db/trunk/empire-db/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,4 @@
.settings
target
+*.iml
Propchange: empire-db/trunk/empire-db-codegen/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -7,3 +7,4 @@ hsqldb
target
.settings
+*.iml
Modified: empire-db/trunk/empire-db-dist/pom.xml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-dist/pom.xml?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-dist/pom.xml (original)
+++ empire-db/trunk/empire-db-dist/pom.xml Fri Jul 4 14:27:47 2014
@@ -53,7 +53,7 @@
<descriptors>
<descriptor>src/assemble/empire-assembly-all.xml</descriptor>
</descriptors>
- <tarLongFileFormat>gnu</tarLongFileFormat>
+ <tarLongFileMode>gnu</tarLongFileMode>
<!-- <outputDirectory>${basedir}/target/dist</outputDirectory> -->
<!-- <finalName>apache-empire-db-${project.version}</finalName> -->
<appendAssemblyId>true</appendAssemblyId>
Propchange: empire-db/trunk/empire-db-examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,4 @@
.settings
target
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-advanced/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -7,3 +7,4 @@ target
.project
hsqldb
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-basic/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -7,3 +7,4 @@ target
.project
hsqldb
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-codegen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -0,0 +1 @@
+target
Modified: empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml (original)
+++ empire-db/trunk/empire-db-examples/empire-db-example-codegen/pom.xml Fri Jul 4 14:27:47 2014
@@ -31,14 +31,14 @@
<configuration>
<source>1.5</source>
<target>1.5</target>
- <optimise>true</optimise>
+ <optimize>true</optimize>
<debug>true</debug>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db-maven-plugin</artifactId>
- <version>2.3.0</version>
+ <version>2.4.2</version>
<configuration>
<goalPrefix>empiredb</goalPrefix>
<jdbcClass>org.hsqldb.jdbcDriver</jdbcClass>
@@ -73,7 +73,7 @@
<dependency>
<groupId>org.apache.empire-db</groupId>
<artifactId>empire-db</artifactId>
- <version>2.3.0</version>
+ <version>2.4.2</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-cxf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -7,3 +7,4 @@ target
.settings
hsqldb
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-jsf2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -9,3 +9,4 @@ work
.project
.classpath
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-spring/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,4 @@ target
.classpath
.settings
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-struts2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -9,3 +9,4 @@ target
work
.tomcatplugin
+*.iml
Propchange: empire-db/trunk/empire-db-examples/empire-db-example-struts2-cxf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -9,3 +9,4 @@ target
work
.tomcatplugin
+*.iml
Propchange: empire-db/trunk/empire-db-jsf2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,4 @@ target
.classpath
.project
+*.iml
Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java (original)
+++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pageelements/RecordPageElement.java Fri Jul 4 14:27:47 2014
@@ -95,8 +95,7 @@ public class RecordPageElement<T extends
}
/**
- * loads the record identified by the supplied key from the database<BR/>
- * @return true if the record has been successfully reloaded or false otherwise
+ * loads the record identified by the supplied key from the database<BR>
*/
public void reloadRecord()
{
@@ -119,8 +118,7 @@ public class RecordPageElement<T extends
}
/**
- * loads the record identified by the supplied key from the database<BR/>
- * @return true if the record has been successfully reloaded or false otherwise
+ * loads the record identified by the supplied key from the database<BR>
*/
public void loadRecord(Object[] recKey)
{
Modified: empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java (original)
+++ empire-db/trunk/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/pages/PageDefinitions.java Fri Jul 4 14:27:47 2014
@@ -66,7 +66,7 @@ public abstract class PageDefinitions im
/**
* Register page beans with the BeanManager
- * @param bm
+ * @param facesImpl
*/
public void registerPageBeans(FacesImplementation facesImpl)
{
Propchange: empire-db/trunk/empire-db-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,4 @@ target
.project
.classpath
+*.iml
Modified: empire-db/trunk/empire-db-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-maven-plugin/pom.xml?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-maven-plugin/pom.xml (original)
+++ empire-db/trunk/empire-db-maven-plugin/pom.xml Fri Jul 4 14:27:47 2014
@@ -37,7 +37,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>3.0</version>
</dependency>
<!-- <dependency>
<groupId>org.apache.maven</groupId>
@@ -49,6 +49,13 @@
<artifactId>maven-project</artifactId>
<version>2.0</version>
</dependency>
+ <!-- dependencies to annotations -->
+ <dependency>
+ <groupId>org.apache.maven.plugin-tools</groupId>
+ <artifactId>maven-plugin-annotations</artifactId>
+ <version>3.3</version>
+ <scope>provided</scope><!-- annotations are needed only to build the plugin -->
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -65,4 +72,28 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>3.2</version>
+ <configuration>
+ <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
+ </configuration>
+ <executions>
+ <execution>
+ <id>mojo-descriptor</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: empire-db/trunk/empire-db-maven-plugin/src/main/java/org/apache/empire/db/maven/CodeGenMojo.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-maven-plugin/src/main/java/org/apache/empire/db/maven/CodeGenMojo.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-maven-plugin/src/main/java/org/apache/empire/db/maven/CodeGenMojo.java (original)
+++ empire-db/trunk/empire-db-maven-plugin/src/main/java/org/apache/empire/db/maven/CodeGenMojo.java Fri Jul 4 14:27:47 2014
@@ -30,85 +30,69 @@ import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.*;
import org.apache.maven.project.MavenProject;
/**
- * Generates code by reading an existing database schema
- *
- * @goal codegen
- * @description Empire-DB Code generation
- * @requiresDependencyResolution runtime
- * @phase generate-sources
+ * Empire-DB Code generation by reading an existing database schema
*/
+@Mojo(
+ name = "codegen",
+ defaultPhase = LifecyclePhase.GENERATE_SOURCES,
+ requiresDependencyResolution = ResolutionScope.RUNTIME)
public class CodeGenMojo extends AbstractMojo {
- /**
- * @parameter expression="${project}"
- * @readonly
- */
+ @Component
private MavenProject project;
/**
* Codegen configuration file, if the file is provided, only that file
* is used to configure code generation
- *
- * @parameter expression="${empiredb.configFile}"
*/
+ @Parameter(property = "empiredb.configFile")
private File configFile;
/**
* Location of the generated sources.
- *
- * @parameter
- * expression="${empiredb.generatedsources}"
- * default-value="${project.build.directory}/generated-sources/empiredb"
- * @required
*/
+ @Parameter(defaultValue = "${project.build.directory}/generated-sources/empiredb", property = "empiredb.generatedsources", required = true)
private File targetDirectory;
/**
* JDBC url
- *
- * @parameter expression="${empiredb.jdbcURL}"
- * @required
*/
+ @Parameter(property = "empiredb.jdbcURL", required = true)
private String jdbcURL;
/**
* JDBC Driver class
- *
- * @parameter expression="${empiredb.jdbcClass}"
- * @required
*/
+ @Parameter(property = "empiredb.jdbcClass", required = true)
private String jdbcClass;
/**
* JDBC Database user
- *
- * @parameter expression="${empiredb.jdbcUser}"
*/
+ @Parameter(property = "empiredb.jdbcUser")
private String jdbcUser;
/**
* JDBC Database password
- *
- * @parameter expression="${empiredb.jdbcPwd}"
*/
+ @Parameter(property = "empiredb.jdbcPwd")
private String jdbcPwd;
/**
* Code generator template directory, if not set the default templates
* are loaded from the classpath
- *
- * @parameter expression="${empiredb.templateDirectory}"
*/
+ @Parameter(property = "empiredb.templateDirectory")
private String templateDirectory;
/**
* The package for the generated sources
- *
- * @parameter expression="${empiredb.packageName}"
*/
+ @Parameter(property = "empiredb.packageName")
private String packageName;
public void execute() throws MojoExecutionException
Propchange: empire-db/trunk/empire-db-struts2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Jul 4 14:27:47 2014
@@ -5,3 +5,4 @@
.classpath
target
+*.iml
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/ActionErrorProvider.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/ActionErrorProvider.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/ActionErrorProvider.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/action/ActionErrorProvider.java Fri Jul 4 14:27:47 2014
@@ -37,7 +37,7 @@ public interface ActionErrorProvider
void clearActionErrors();
/**
- * returns the last Action Error of the current or a previous aciton
+ * returns the last Action Error of the current or a previous action
* the error is left on the session unless the clear flag is set to true
* In order to display the error to the user an application should use
* this function instead of getActionError() and set clear to true.
@@ -58,7 +58,8 @@ public interface ActionErrorProvider
/**
* return the localized message for an error
- *
+ *
+ * @param error the error info
* @return the error message in the curren user's language
*/
String getLocalizedErrorMessage(ErrorInfo error);
@@ -66,7 +67,8 @@ public interface ActionErrorProvider
/**
* returns the last set Action Message
* the message is left on the session unless the clear flag is set to true
- *
+ *
+ * @param clear if true will clear the message from the session
* @return an action message for the user
*/
String getLastActionMessage(boolean clear);
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionError.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionError.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionError.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/ActionError.java Fri Jul 4 14:27:47 2014
@@ -66,9 +66,6 @@ public class ActionError implements Erro
// Default Constructor
}
- /**
- * @see ErrorObject#error(ErrorInfo)
- */
public ActionError(ErrorInfo other)
{
// copy other error
@@ -90,10 +87,7 @@ public class ActionError implements Erro
// copy other error
this(new InternalException(e));
}
-
- /**
- * @see ErrorObject#error(ErrorType, Object[])
- */
+
public ActionError(ErrorType errType, String[] params)
{ // Set the Error
this.errType = errType;
@@ -101,17 +95,11 @@ public class ActionError implements Erro
this.errMsg = MessageFormat.format(errType.getMessagePattern(), (Object[])params);
}
- /**
- * @see ErrorObject#error(ErrorType, Object)
- */
public ActionError(ErrorType errType, String param)
{
this(errType, new String[] { param });
}
- /**
- * @see ErrorObject#error(ErrorType)
- */
public ActionError(ErrorType errType)
{
this(errType, (String[])null);
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/BeanActionSupport.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/BeanActionSupport.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/BeanActionSupport.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/BeanActionSupport.java Fri Jul 4 14:27:47 2014
@@ -33,7 +33,7 @@ import org.apache.empire.struts2.excepti
* <p>
* This class provides functions for form data processing through ordinary JavaBean or Data Transfer Objects (DTO).
* Metadata for the Beans should be provided using the BeanClass and BeanProperty classes.<br>
- * It is recommended (but not necessary) to create a subclass of the BeanRecordProxy<T> class in order to provide
+ * It is recommended (but not necessary) to create a subclass of the BeanRecordProxy<T> class in order to provide
* further context specific metadata.
* </p>
* @author Rainer
@@ -169,7 +169,6 @@ public class BeanActionSupport<T> extend
/**
* Initializes the key columns of the current record from the action parameters.
- * @return true if the key columns were set successfully of false otherwise
*/
public void initKeyColumns()
{
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordActionSupport.java Fri Jul 4 14:27:47 2014
@@ -152,7 +152,7 @@ public class RecordActionSupport extends
// ------- Methods -------
/**
- * creates a new record.<BR/>
+ * creates a new record.<BR>
* Depending on the persistence setting the record key or the record data will be stored on the session.
* @return true if the record was successfully created or false otherwise
*/
@@ -173,9 +173,8 @@ public class RecordActionSupport extends
}
/**
- * sets all required foreign keys for this record.<BR/>
+ * sets all required foreign keys for this record.<BR>
* The foreign key values must be supplied with the request.
- * @return true if all required foreign keys have been successfully set, or false otherwise
*/
public void initReferenceColumns()
{
@@ -202,8 +201,7 @@ public class RecordActionSupport extends
}
/**
- * loads the record identified by the supplied key from the database<BR/>
- * @return true if the record has been successfully reloaded or false otherwise
+ * loads the record identified by the supplied key from the database<BR>
*/
public void loadRecord(Object[] recKey)
{
@@ -219,7 +217,7 @@ public class RecordActionSupport extends
}
/**
- * loads the record either from the supplied item key on the request or from the session.<BR/>
+ * loads the record either from the supplied item key on the request or from the session.<BR>
* @return true if the record has been successfully reloaded or false otherwise
*/
public boolean loadRecord()
@@ -243,10 +241,9 @@ public class RecordActionSupport extends
}
/**
- * reloads the current record from the session.<BR/>
+ * reloads the current record from the session.<BR>
* If persistence is set to Key then the key is obtained from the session and the record
- * is reloaded from the database.
- * @return true if the record has been successfully reloaded or false otherwise
+ * is reloaded from the database.
*/
public void reloadRecord()
{ // Load
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordFormActionSupport.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordFormActionSupport.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordFormActionSupport.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/actionsupport/RecordFormActionSupport.java Fri Jul 4 14:27:47 2014
@@ -237,11 +237,9 @@ public abstract class RecordFormActionSu
/**
* adds all fields found in the HTTP-JSPRequest for this table to the record
*
- * @param rec
+ * @param record
* the Record object, contains all fields and the field
* properties
- * @param request
- * request providing access to the HTTP-JSPRequest parameters
* @return true if all values have been set successfully or otherwise false
*/
protected boolean setUpdateFields(Record record)
@@ -341,9 +339,7 @@ public abstract class RecordFormActionSu
/**
* this method compares two primary key objects
- *
- * @param keyColumns
- * an array of the primary key columns
+ *
* @param currentKey
* the current key object
* @param updateKey
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/exceptions/WebException.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/exceptions/WebException.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/exceptions/WebException.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/exceptions/WebException.java Fri Jul 4 14:27:47 2014
@@ -23,19 +23,12 @@ import org.apache.empire.exceptions.Empi
public abstract class WebException extends EmpireException
{
- /**
- * Comment for <code>serialVersionUID</code>
- */
private static final long serialVersionUID = 1L;
/**
- * Comment for <code>serialVersionUID</code>
- */
- /**
* Constructor for derived classes
* @param errType
* @param params
- * @param cause
*/
protected WebException(final ErrorType errType, final String[] params)
{
Modified: empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/DefaultWebRequest.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/DefaultWebRequest.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/DefaultWebRequest.java (original)
+++ empire-db/trunk/empire-db-struts2/src/main/java/org/apache/empire/struts2/web/DefaultWebRequest.java Fri Jul 4 14:27:47 2014
@@ -32,7 +32,7 @@ public class DefaultWebRequest implement
}
/**
- * @see WebRequest#getHttpRequest()
+ * @see WebRequest#getRequestContext()
*/
public RequestContext getRequestContext()
{
@@ -40,7 +40,7 @@ public class DefaultWebRequest implement
}
/**
- * @see WebRequest#getHttpResponse()
+ * @see WebRequest#getResponseContext()
*/
public ResponseContext getResponseContext()
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Attributes.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Attributes.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Attributes.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/commons/Attributes.java Fri Jul 4 14:27:47 2014
@@ -213,7 +213,7 @@ public class Attributes extends Abstract
/**
* @param name the attribute
- * @param The attribute to set
+ * @param value The attribute to set
*/
public Attribute set(String name, Object value)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/DataType.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/DataType.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/DataType.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/data/DataType.java Fri Jul 4 14:27:47 2014
@@ -76,7 +76,7 @@ public enum DataType
BOOL, // = 9;
/**
- * Long text > 2K
+ * Long text > 2K
*/
CLOB, // = 10;
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCmdParam.java Fri Jul 4 14:27:47 2014
@@ -51,7 +51,7 @@ public class DBCmdParam extends DBExpr
* Returns the internal parameter value for a given "real" value.
* Depending on the data type this might involve wrapping the real value with another class.
* This is done e.g. for CLOBs and BLOBs
- * @param the "real" value
+ * @param value the "real" value
* @return the (possibly wrapped) value
*/
protected Object getCmdParamValue(Object value)
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumn.java Fri Jul 4 14:27:47 2014
@@ -119,8 +119,8 @@ public abstract class DBColumn extends D
/**
* returns a rowset by its identifier
- * @param rowsetId the id of the rowset
- * @return the rowset object
+ * @param columnId the id of the column
+ * @return the DBColumn object
*/
public static DBColumn findById(String columnId)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBColumnExpr.java Fri Jul 4 14:27:47 2014
@@ -396,7 +396,7 @@ public abstract class DBColumnExpr exten
/**
* Creates and returns a new comparison object
- * for the SQL "<>" (not equal) operator.
+ * for the SQL "<>" (not equal) operator.
*
* @param value the Object value
* @return the new DBCompareColExpr object
@@ -458,7 +458,7 @@ public abstract class DBColumnExpr exten
/**
* Creates and returns a new comparison object
- * for the SQL ">" (greater than) operator.
+ * for the SQL ">" (greater than) operator.
*
* @param value the Object value
* @return the new DBCompareColExpr object
@@ -470,7 +470,7 @@ public abstract class DBColumnExpr exten
/**
* Creates and returns a new comparison object
- * for the SQL ">=" (greater or equal) operator.
+ * for the SQL ">=" (greater or equal) operator.
*
* @param value the Object value
* @return the new DBCompareColExpr object
@@ -482,7 +482,7 @@ public abstract class DBColumnExpr exten
/**
* Creates and returns a new comparison object
- * for the SQL "<=" (less or equal) operator.
+ * for the SQL "<=" (less or equal) operator.
*
* @param value the Object value
* @return the new DBCompareColExpr object
@@ -494,7 +494,7 @@ public abstract class DBColumnExpr exten
/**
* Creates and returns a new comparison object
- * for the SQL "<" (less than) operator.
+ * for the SQL "<" (less than) operator.
*
* @param value the Object value
* @return the new DBCompareColExpr object
@@ -1067,8 +1067,8 @@ public abstract class DBColumnExpr exten
}
/**
- * Creates and returns a sql-expression for the SQL case-phrase.<BR/>
- * The result will be in the form:<BR/>
+ * Creates and returns a sql-expression for the SQL case-phrase.<br>
+ * The result will be in the form:<br>
* "case when [compExpr] then [this] else [otherwise] end"
*
* @param compExpr the condition for which the current column expression is returned
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCombinedCmd.java Fri Jul 4 14:27:47 2014
@@ -122,7 +122,6 @@ public class DBCombinedCmd extends DBCom
* Creates the SQL-Command.
*
* @param buf the SQL-Command
- * @return true if the creation was successful
*/
@Override
public void getSelect(StringBuilder buf)
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBCommandExpr.java Fri Jul 4 14:27:47 2014
@@ -444,8 +444,7 @@ public abstract class DBCommandExpr exte
/**
* set the maximum number of rows to return when executing a query command
* A negative value will remove the limit.
- *
- * @return true if the database supports a limit or false otherwise
+ *
*/
public void limitRows(int numRows)
{
@@ -455,8 +454,6 @@ public abstract class DBCommandExpr exte
/**
* sets the offset of the first row to return when executing a query command.
* A negative value will remove the offset.
- *
- * @return true if the database supports an offset or false otherwise
*/
public void skipRows(int numRows)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDDLGenerator.java Fri Jul 4 14:27:47 2014
@@ -18,8 +18,6 @@
*/
package org.apache.empire.db;
-import java.util.Iterator;
-
import org.apache.empire.data.DataType;
import org.apache.empire.exceptions.InvalidArgumentException;
import org.apache.empire.exceptions.MiscellaneousErrorException;
@@ -89,9 +87,9 @@ public abstract class DBDDLGenerator<T e
/**
* appends the data type of a column
- * @param type
- * @param size
- * @param sql
+ * @param type the type
+ * @param size the size
+ * @param sql the builder that we will append to
* @return true if further column attributes may be added or false otherwise
*/
protected boolean appendColumnDataType(DataType type, double size, DBTableColumn c, StringBuilder sql)
@@ -162,7 +160,7 @@ public abstract class DBDDLGenerator<T e
case BLOB:
sql.append(DATATYPE_BLOB);
if (size > 0) {
- sql.append("(" + ((long)size) + ") ");
+ sql.append("(").append((long) size).append(") ");
}
break;
case UNIQUEID:
@@ -182,7 +180,6 @@ public abstract class DBDDLGenerator<T e
* @param c the column which description to append
* @param alter true if altering an existing column or false otherwise
* @param sql the sql builder object
- * @return true if the column was successfully appended or false otherwise
*/
protected void appendColumnDesc(DBTableColumn c, boolean alter, StringBuilder sql)
{
@@ -291,7 +288,6 @@ public abstract class DBDDLGenerator<T e
else if (dbo instanceof DBTableColumn)
{ // Table Column
alterTable((DBTableColumn) dbo, type, script);
- return;
}
else
{ // dll generation not supported for this type
@@ -300,7 +296,7 @@ public abstract class DBDDLGenerator<T e
}
/**
- * Appends the DDL-Script for creating the given database to an SQL-Script<br/>
+ * Appends the DDL-Script for creating the given database to an SQL-Script<br>
* This includes the generation of all tables, views and relations.
* @param db the database to create
* @param script the sql script to which to append the dll command(s)
@@ -308,28 +304,23 @@ public abstract class DBDDLGenerator<T e
protected void createDatabase(DBDatabase db, DBSQLScript script)
{
// Create all Tables
- Iterator<DBTable> tables = db.getTables().iterator();
- while (tables.hasNext())
+ for (DBTable dbTable : db.getTables())
{
- createTable(tables.next(), script);
+ createTable(dbTable, script);
}
// Create Relations
- Iterator<DBRelation> relations = db.getRelations().iterator();
- while (relations.hasNext())
+ for (DBRelation dbRelation : db.getRelations())
{
- createRelation(relations.next(), script);
+ createRelation(dbRelation, script);
}
// Create Views
- Iterator<DBView> views = db.getViews().iterator();
- while (views.hasNext())
+ for (DBView v : db.getViews())
{
- DBView v = views.next();
try {
createView(v, script);
- } catch(NotSupportedException e) {
+ } catch (NotSupportedException e) {
// View command not implemented
log.warn("Error creating the view {0}. This view will be ignored.", v.getName());
- continue;
}
}
}
@@ -359,11 +350,9 @@ public abstract class DBDDLGenerator<T e
t.addSQL(sql, DBExpr.CTX_FULLNAME);
sql.append(" (");
boolean addSeparator = false;
- Iterator<DBColumn> columns = t.getColumns().iterator();
- while (columns.hasNext())
- {
- DBTableColumn c = (DBTableColumn) columns.next();
- if (c.getDataType()==DataType.UNKNOWN)
+ for (DBColumn dbColumn : t.getColumns()) {
+ DBTableColumn c = (DBTableColumn) dbColumn;
+ if (c.getDataType() == DataType.UNKNOWN)
continue; // Ignore and continue;
// Append column
sql.append((addSeparator) ? ",\r\n " : "\r\n ");
@@ -383,10 +372,9 @@ public abstract class DBDDLGenerator<T e
addSeparator = false;
// columns
DBColumn[] keyColumns = pk.getColumns();
- for (int i = 0; i < keyColumns.length; i++)
- {
- sql.append((addSeparator) ? ", " : "");
- keyColumns[i].addSQL(sql, DBExpr.CTX_NAME);
+ for (DBColumn keyColumn : keyColumns) {
+ sql.append(addSeparator ? ", " : "");
+ keyColumn.addSQL(sql, DBExpr.CTX_NAME);
addSeparator = true;
}
sql.append(")");
@@ -407,10 +395,8 @@ public abstract class DBDDLGenerator<T e
protected void createTableIndexes(DBTable t, DBIndex pk, DBSQLScript script)
{
// Create other Indexes (except primary key)
- Iterator<DBIndex> indexes = t.getIndexes().iterator();
- while (indexes.hasNext())
+ for (DBIndex idx : t.getIndexes())
{
- DBIndex idx = indexes.next();
if (idx == pk || idx.getType() == DBIndex.PRIMARYKEY)
continue;
@@ -422,7 +408,7 @@ public abstract class DBDDLGenerator<T e
/**
* Appends the DDL-Script for creating a single index to an SQL-Script
* @param t the table
- * @param index the index to create
+ * @param idx the index to create
* @param script the sql script to which to append the dll command(s)
*/
protected void createIndex(DBTable t, DBIndex idx, DBSQLScript script)
@@ -439,10 +425,10 @@ public abstract class DBDDLGenerator<T e
// columns
boolean addSeparator = false;
DBExpr[] idxColumns = idx.getExpressions();
- for (int i = 0; i < idxColumns.length; i++)
+ for (DBExpr idxColumn : idxColumns)
{
- sql.append((addSeparator) ? ", " : "");
- idxColumns[i].addSQL(sql, DBExpr.CTX_NAME);
+ sql.append(addSeparator ? ", " : "");
+ idxColumn.addSQL(sql, DBExpr.CTX_NAME);
sql.append("");
addSeparator = true;
}
@@ -473,10 +459,10 @@ public abstract class DBDDLGenerator<T e
// Source Names
boolean addSeparator = false;
DBRelation.DBReference[] refs = r.getReferences();
- for (int i = 0; i < refs.length; i++)
+ for (DBRelation.DBReference ref1 : refs)
{
sql.append((addSeparator) ? ", " : "");
- refs[i].getSourceColumn().addSQL(sql, DBExpr.CTX_NAME);
+ ref1.getSourceColumn().addSQL(sql, DBExpr.CTX_NAME);
addSeparator = true;
}
// References
@@ -485,10 +471,10 @@ public abstract class DBDDLGenerator<T e
sql.append(" (");
// Target Names
addSeparator = false;
- for (int i = 0; i < refs.length; i++)
+ for (DBRelation.DBReference ref : refs)
{
sql.append((addSeparator) ? ", " : "");
- refs[i].getTargetColumn().addSQL(sql, DBExpr.CTX_NAME);
+ ref.getTargetColumn().addSQL(sql, DBExpr.CTX_NAME);
addSeparator = true;
}
sql.append(")");
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabase.java Fri Jul 4 14:27:47 2014
@@ -1172,7 +1172,7 @@ public abstract class DBDatabase extends
}
/**
- * Adds the result of a query to a given collection.<br/>
+ * Adds the result of a query to a given collection.<br>
* The individual rows will be added as an array of objects (object[])
* <p>This function should only be used for small lists.
* Otherwise a DBReader should be used!</p>
@@ -1225,7 +1225,7 @@ public abstract class DBDatabase extends
}
/**
- * Adds the result of a query to a given collection.<br/>
+ * Adds the result of a query to a given collection.<br>
* The individual rows will be added as an array of objects (object[])
* <p>This function should only be used for small lists.
* Otherwise a DBReader should be used!</p>
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBDatabaseDriver.java Fri Jul 4 14:27:47 2014
@@ -271,9 +271,9 @@ public abstract class DBDatabaseDriver i
public abstract boolean isSupported(DBDriverFeature type);
/**
- * Detects whether a table or column name needs to be quoted or not<BR/>
+ * Detects whether a table or column name needs to be quoted or not<br>
* By default all reserved SQL keywords as well as names
- * containing a "-", "/", "+" or " " require quoting.<BR/>
+ * containing a "-", "/", "+" or " " require quoting.<br>
* Overrides this function to add database specific keywords like "user" or "count"
*/
protected boolean detectQuoteName(String name)
@@ -415,7 +415,9 @@ public abstract class DBDatabaseDriver i
* Adds a statement parameter to a prepared statement
*
* @param pstmt the prepared statement
- * @param sqlParams list of objects
+ * @param paramIndex the parameter index
+ * @param value the parameter value
+ * @param conn the connection
*/
protected void addStatementParam(PreparedStatement pstmt, int paramIndex, Object value, Connection conn)
throws SQLException
@@ -822,8 +824,6 @@ public abstract class DBDatabaseDriver i
* @param db the database
* @param owner the owner
* @param conn the connection
- *
- * @return true if it is consistent with the description
*/
public void checkDatabase(DBDatabase db, String owner, Connection conn)
{
@@ -842,7 +842,7 @@ public abstract class DBDatabaseDriver i
}
/**
- * Appends a statement to enable or disable a foreign key relation.<br/
+ * Appends a statement to enable or disable a foreign key relation.<br>
* The default is to drop or create the relation
* Override this method to provide different behavior for your database.
* @param r the foreign key relation which should be enabled or disabled
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpressionIndex.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpressionIndex.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpressionIndex.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBExpressionIndex.java Fri Jul 4 14:27:47 2014
@@ -23,8 +23,6 @@ import org.apache.empire.exceptions.Inva
/**
* This class handles the primary key for the tables.
* The primary key contains one or more columns.
- * <P>
- *
*
*/
public class DBExpressionIndex extends DBIndex
@@ -55,7 +53,7 @@ public class DBExpressionIndex extends D
*
* @param name the index name
* @param unique true if the index has only unique values or false otherwise
- * @param columnExpression an column expressions that defines the key values for the index
+ * @param expr an column expressions that defines the key values for the index
*/
public DBExpressionIndex(String name, boolean unique, DBColumnExpr expr)
{
@@ -89,11 +87,11 @@ public class DBExpressionIndex extends D
@Override
public boolean contains(DBColumn col)
{
- for (int i = 0; i < columnExpressions.length; i++)
+ for (DBExpr columnExpression : columnExpressions)
{
- if (!(columnExpressions[i] instanceof DBColumnExpr))
+ if (!(columnExpression instanceof DBColumnExpr))
continue;
- if (col.equals(((DBColumnExpr)columnExpressions[i]).getUpdateColumn()))
+ if (col.equals(((DBColumnExpr) columnExpression).getUpdateColumn()))
return true;
}
return false;
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBQuery.java Fri Jul 4 14:27:47 2014
@@ -368,7 +368,7 @@ public class DBQuery extends DBRowSet
*
* @param rec the DBRecord object, contains all fields and the field properties
* @param conn a valid database connection
- * @return a not implemented error
+ * @throws NotImplementedException because this is not implemented
*/
@Override
public void createRecord(DBRecord rec, Connection conn)
@@ -619,7 +619,6 @@ public class DBQuery extends DBRowSet
*
* @param keys array of primary key values
* @param conn a valid database connection
- * @return true if the record has been successfully deleted or false otherwise
*/
@Override
public void deleteRecord(Object[] keys, Connection conn)
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBReader.java Fri Jul 4 14:27:47 2014
@@ -63,7 +63,7 @@ import org.w3c.dom.Element;
* <li>access field values directly by using one of the get... functions (see {@link DBRecordData})</li>
* <li>get the rows as a list of Java Beans using by using {@link DBReader#getBeanList(Class, int)}</li>
* <li>get the rows as an XML-Document using {@link DBReader#getXmlDocument()} </li>
- * <li>initialize a DBRecord with the current row data using {@link DBReader#initRecord(DBRowSet, DBRecord)}<br/>
+ * <li>initialize a DBRecord with the current row data using {@link DBReader#initRecord(DBRowSet, DBRecord)}<br>
* This will allow you to modify and update the data.
* </li>
* </ul>
@@ -227,7 +227,6 @@ public class DBReader extends DBRecordDa
/**
* Support for finding code errors where a DBRecordSet is opened but not closed
- * @author bond
*/
private static ThreadLocal<Map<DBReader, Exception>> threadLocalOpenResultSets = new ThreadLocal<Map<DBReader, Exception>>();
@@ -603,7 +602,6 @@ public class DBReader extends DBRecordDa
* </PRE>
* @param rowset the rowset to which to attach
* @param rec the record which to initialize
- * @return true if the record has been initialized successfully or false otherwise
*/
public void initRecord(DBRowSet rowset, DBRecord rec)
{
@@ -621,7 +619,7 @@ public class DBReader extends DBRecordDa
* @param t the class type of the objects in the list
* @param maxCount the maximum number of objects
*
- * @return the list of <T>
+ * @return the list of T
*/
@SuppressWarnings("unchecked")
public <C extends Collection<T>, T> C getBeanList(C c, Class<T> t, int maxCount)
@@ -680,7 +678,7 @@ public class DBReader extends DBRecordDa
* @param t the class type of the objects in the list
* @param maxItems the maximum number of objects
*
- * @return the list of <T>
+ * @return the list of T
*/
public final <T> ArrayList<T> getBeanList(Class<T> t, int maxItems) {
return getBeanList(new ArrayList<T>(), t, maxItems);
@@ -691,7 +689,7 @@ public class DBReader extends DBRecordDa
*
* @param t the class type of the objects in the list
*
- * @return the list of <T>
+ * @return the list of T
*/
public final <T> ArrayList<T> getBeanList(Class<T> t) {
return getBeanList(t, -1);
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRecord.java Fri Jul 4 14:27:47 2014
@@ -107,8 +107,8 @@ public class DBRecord extends DBRecordDa
/**
* This method is used internally by the RowSet to initialize the record's properties
* @param rowset the rowset to which to attach this record
- * @param state the state of the record
* @param rowSetData any further RowSet specific data
+ * @param newRecord
*/
protected void initData(DBRowSet rowset, Object rowSetData, boolean newRecord)
{
@@ -749,7 +749,6 @@ public class DBRecord extends DBRecordDa
* @param table the rowset from which to read the record
* @param keys an array of the primary key values
* @param conn a valid connection to the database.
- * @return true if the record was successfully loaded or false if the record was not found or an error occurred.
*/
public void read(DBRowSet table, Object[] keys, Connection conn)
{
@@ -767,7 +766,6 @@ public class DBRecord extends DBRecordDa
* @param table the rowset from which to read the record
* @param id the primary key of the record to load.
* @param conn a valid connection to the database.
- * @return true if the record was successfully loaded or false if the record was not found or an error occurred.
*/
public final void read(DBRowSet table, Object id, Connection conn)
{
@@ -976,7 +974,6 @@ public class DBRecord extends DBRecordDa
* @param bean the Java Bean from which to read the value from
* @param property the name of the property
* @param column the column for which to set the record value
- * @return true if the value has been successfully set or false if not
*/
protected void setBeanValue(Object bean, String property, Column column)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRelation.java Fri Jul 4 14:27:47 2014
@@ -218,7 +218,7 @@ public class DBRelation extends DBObject
/**
* Appends the required DLL command to enable or disable a foreign key constraint to the supplied DBDQLScript.
* @param enable true if the constraint should be enabled or false to disable the constraint
- * @param the driver for which to enable or disable the relation
+ * @param driver the driver for which to enable or disable the relation
*/
public String getEnableDisableStmt(boolean enable, DBDatabaseDriver driver)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBRowSet.java Fri Jul 4 14:27:47 2014
@@ -473,7 +473,8 @@ public abstract class DBRowSet extends D
* Initialize this DBRowSet object and sets it's initial state.
*
* @param rec the DBRecord object to initialize this DBRowSet object
- * @param state the state of this DBRowSet object
+ * @param rowSetData any further RowSet specific data
+ * @param insert
*/
protected void prepareInitRecord(DBRecord rec, Object rowSetData, boolean insert)
{
@@ -574,7 +575,6 @@ public abstract class DBRowSet extends D
* Set the constraints for a single record from a supplied key
* @param cmd the command to which to add the constraints
* @param key the record key
- * @return true if the constraints have been successfully set or false otherwise
*/
protected void setKeyConstraints(DBCommand cmd, Object[] key)
{
@@ -690,7 +690,6 @@ public abstract class DBRowSet extends D
* <P>
* @param rec the DBRecord object. contains all fields and the field properties
* @param conn a valid JDBC connection.
- * @return true if the update was successful or false otherwise
*/
public void updateRecord(DBRecord rec, Connection conn)
{
@@ -851,7 +850,6 @@ public abstract class DBRowSet extends D
* <P>
* @param id the record's primary key
* @param conn a valid JDBC connection
- * @return true if the record has been successfully deleted or false otherwise
*/
public final void deleteRecord(Object id, Connection conn)
{
@@ -863,7 +861,6 @@ public abstract class DBRowSet extends D
* <P>
* @param key the key the record to be deleted
* @param conn a valid connection
- * @return true if all reference records could be deleted
*/
protected final void deleteAllReferences(Object[] key, Connection conn)
{
@@ -896,7 +893,6 @@ public abstract class DBRowSet extends D
* @param refs the reference columns belonging to the relation
* @param parentKey the key of the parent element
* @param conn a valid connection
- * @return true if all records could be deleted or false otherwise
*/
protected void deleteReferenceRecords(DBReference[] refs, Object[] parentKey, Connection conn)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBTable.java Fri Jul 4 14:27:47 2014
@@ -39,8 +39,6 @@ import org.apache.empire.exceptions.Unex
/**
* This class represent one table of the database.
* It contains methods to get, add, update and delete records from the database.
- * <P>
- *
*
*/
public class DBTable extends DBRowSet implements Cloneable
@@ -115,7 +113,7 @@ public class DBTable extends DBRowSet im
* Clones this table and assigns a new table alias.
* This second instance of the same table can be used for self-joins.
* <pre>
- * This method requires that all declared column fields are NOT declared final.</p>
+ * This method requires that all declared column fields are NOT declared final.
* i.e. instead of:
*
* public final DBTableColumn MYCOL;
@@ -134,12 +132,11 @@ public class DBTable extends DBRowSet im
* ...
* cmd.join(MYTABLE1.ID, MYTABLE2.PARENTID); // self-join
* ...
- * <pre>
+ * </pre>
* @return a table clone with new table alias
*/
@Override
- public Object clone()
- {
+ public Object clone() throws CloneNotSupportedException {
try {
DBTable clone = (DBTable) super.clone();
// clone all columns
@@ -266,7 +263,7 @@ public class DBTable extends DBRowSet im
/**
* Returns the primary key.
*
- * @return the the DBIndex object ->primary key
+ * @return the the DBIndex object -> primary key
*/
public DBIndex getPrimaryKey()
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/DBView.java Fri Jul 4 14:27:47 2014
@@ -287,7 +287,6 @@ public abstract class DBView extends DBR
* Adds a column to the view.
*
* @param col a view column object
- * @return true if the column was successfully added or false otherwise
*/
protected void addColumn(DBViewColumn col)
{ // find column by name
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/expr/column/DBAbstractFuncExpr.java Fri Jul 4 14:27:47 2014
@@ -67,7 +67,7 @@ public abstract class DBAbstractFuncExpr
protected abstract String getFunctionName();
/**
- * returns the Database driver or null if the Expression is not attached to an open database<BR/>
+ * returns the Database driver or null if the Expression is not attached to an open database<BR>
* This function is intended for convenience only.
*/
protected final DBDatabaseDriver getDatabaseDriver()
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/HSqlDDLGenerator.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/HSqlDDLGenerator.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/HSqlDDLGenerator.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/hsql/HSqlDDLGenerator.java Fri Jul 4 14:27:47 2014
@@ -40,8 +40,7 @@ public class HSqlDDLGenerator extends DB
}
/**
- * sets Oracle specific data types
- * @param driver
+ * sets HSql specific data types
*/
private void initDataTypes()
{ // Override data types
@@ -67,16 +66,12 @@ public class HSqlDDLGenerator extends DB
protected void createDatabase(DBDatabase db, DBSQLScript script)
{
// Create all Sequences
- Iterator<DBTable> seqtabs = db.getTables().iterator();
- while (seqtabs.hasNext())
+ for (DBTable table : db.getTables())
{
- DBTable table = seqtabs.next();
- Iterator<DBColumn> cols = table.getColumns().iterator();
- while (cols.hasNext())
+ for (DBColumn dbColumn : table.getColumns())
{
- DBTableColumn c = (DBTableColumn) cols.next();
- if (c.getDataType() == DataType.AUTOINC)
- {
+ DBTableColumn c = (DBTableColumn) dbColumn;
+ if (c.getDataType() == DataType.AUTOINC) {
createSequence(db, c, script);
}
}
@@ -86,7 +81,7 @@ public class HSqlDDLGenerator extends DB
}
/**
- * Appends the DDL-Script for creating a sequence to an SQL-Script<br/>
+ * Appends the DDL-Script for creating a sequence to an SQL-Script<br>
* @param db the database to create
* @param c the column for which to create the sequence
* @param script the sql script to which to append the dll command(s)
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDDLGenerator.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDDLGenerator.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDDLGenerator.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/oracle/OracleDDLGenerator.java Fri Jul 4 14:27:47 2014
@@ -18,8 +18,6 @@
*/
package org.apache.empire.db.oracle;
-import java.util.Iterator;
-
import org.apache.empire.data.DataType;
import org.apache.empire.db.DBColumn;
import org.apache.empire.db.DBDDLGenerator;
@@ -47,7 +45,7 @@ public class OracleDDLGenerator extends
/**
* sets Oracle specific data types
- * @param driver
+ * @param driver the oracle driver in use
*/
private void initDataTypes(DBDatabaseDriverOracle driver)
{ // Override data types
@@ -96,16 +94,12 @@ public class OracleDDLGenerator extends
protected void createDatabase(DBDatabase db, DBSQLScript script)
{
// Create all Sequences
- Iterator<DBTable> seqtabs = db.getTables().iterator();
- while (seqtabs.hasNext())
+ for (DBTable table : db.getTables())
{
- DBTable table = seqtabs.next();
- Iterator<DBColumn> cols = table.getColumns().iterator();
- while (cols.hasNext())
+ for (DBColumn dbColumn : table.getColumns())
{
- DBTableColumn c = (DBTableColumn) cols.next();
- if (c.getDataType() == DataType.AUTOINC)
- {
+ DBTableColumn c = (DBTableColumn) dbColumn;
+ if (c.getDataType() == DataType.AUTOINC) {
createSequence(db, c, script);
}
}
@@ -145,21 +139,14 @@ public class OracleDDLGenerator extends
// Add Column comments (if any)
DBDatabase db = t.getDatabase();
createComment(db, "TABLE", t, t.getComment(), script);
- Iterator<DBColumn> columns = t.getColumns().iterator();
- while (columns.hasNext())
+ for (DBColumn c : t.getColumns())
{
- DBColumn c = columns.next();
String com = c.getComment();
if (com != null)
createComment(db, "COLUMN", c, com, script);
}
}
-
- /**
- * Returns true if the comment has been created successfully.
- *
- * @return true if the comment has been created successfully
- */
+
protected void createComment(DBDatabase db, String type, DBExpr expr, String comment, DBSQLScript script)
{
if (comment==null || comment.length()==0)
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/DBDatabaseDriverPostgreSQL.java Fri Jul 4 14:27:47 2014
@@ -260,11 +260,10 @@ public class DBDatabaseDriverPostgreSQL
/**
* Creates the reverse function in postgre sql that returns the reverse of a string value.
* The reverse function may be helpful in SQL to analyze a text field from its end.
- * This function must be called manually by the application depending on whether it needs to use this function or not.<br/>
+ * This function must be called manually by the application depending on whether it needs to use this function or not.<br>
* The current implementation does not check, whether the reverse function already exists.
* If the functions exists it will be replaced and true is returned.
* @param conn a valid database connection
- * @return true if the reverse function was created successfully or false otherwise
*/
public void createReverseFunction(Connection conn)
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/PostgreDDLGenerator.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/PostgreDDLGenerator.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/PostgreDDLGenerator.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/db/postgresql/PostgreDDLGenerator.java Fri Jul 4 14:27:47 2014
@@ -39,8 +39,7 @@ public class PostgreDDLGenerator extends
}
/**
- * sets Oracle specific data types
- * @param driver
+ * sets PostgreSQL specific data types
*/
private void initDataTypes()
{ // Override data types
@@ -85,16 +84,11 @@ public class PostgreDDLGenerator extends
protected void createDatabase(DBDatabase db, DBSQLScript script)
{
// Create all Sequences
- Iterator<DBTable> seqtabs = db.getTables().iterator();
- while (seqtabs.hasNext())
+ for (DBTable table : db.getTables())
{
- DBTable table = seqtabs.next();
- Iterator<DBColumn> cols = table.getColumns().iterator();
- while (cols.hasNext())
- {
- DBTableColumn c = (DBTableColumn) cols.next();
- if (c.getDataType() == DataType.AUTOINC)
- {
+ for (DBColumn dbColumn : table.getColumns()) {
+ DBTableColumn c = (DBTableColumn) dbColumn;
+ if (c.getDataType() == DataType.AUTOINC) {
createSequence(db, c, script);
}
}
@@ -104,7 +98,7 @@ public class PostgreDDLGenerator extends
}
/**
- * Appends the DDL-Script for creating a sequence to an SQL-Script<br/>
+ * Appends the DDL-Script for creating a sequence to an SQL-Script<br>
* @param db the database to create
* @param c the column for which to create the sequence
* @param script the sql script to which to append the dll command(s)
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireException.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireException.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireException.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireException.java Fri Jul 4 14:27:47 2014
@@ -25,9 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This exception type is used for all empire errors.<br>
- * Exceptions will only be thrown if exceptions are enabled in the ErrorObject.
- * @see ErrorObject#setExceptionsEnabled(boolean)
+ * This exception type is used for all empire errors.
*/
public class EmpireException extends RuntimeException
{
@@ -125,7 +123,7 @@ public class EmpireException extends Run
/**
* The type of error that occurred
- * @see org.apache.empire.commons.Errors
+ * @see org.apache.empire.commons.ErrorType
* @return the type of error
*/
public ErrorType getErrorType()
@@ -135,8 +133,7 @@ public class EmpireException extends Run
/**
* The message parameters for the message.
- * @see org.apache.empire.commons.Errors
- * @return the type of error
+ * @return the parameter array
*/
public String[] getErrorParams()
{
Modified: empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireFileException.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireFileException.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireFileException.java (original)
+++ empire-db/trunk/empire-db/src/main/java/org/apache/empire/exceptions/EmpireFileException.java Fri Jul 4 14:27:47 2014
@@ -21,15 +21,10 @@ package org.apache.empire.exceptions;
import org.apache.empire.commons.ErrorType;
/**
- * This exception type is used for all empire errors.<br>
- * Exceptions will only be thrown if exceptions are enabled in the ErrorObject.
- * @see ErrorObject#setExceptionsEnabled(boolean)
+ * This exception type is used for file related empire errors.<br>
*/
public abstract class EmpireFileException extends EmpireException
{
- /**
- * Comment for <code>serialVersionUID</code>
- */
private static final long serialVersionUID = 1L;
protected EmpireFileException(final ErrorType errType, final String[] params, final Throwable cause)
Modified: empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/AttributesTest.java
URL: http://svn.apache.org/viewvc/empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/AttributesTest.java?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/AttributesTest.java (original)
+++ empire-db/trunk/empire-db/src/test/java/org/apache/empire/commons/AttributesTest.java Fri Jul 4 14:27:47 2014
@@ -52,23 +52,6 @@ public class AttributesTest
}
/**
- * Test method for {@link org.apache.empire.commons.Attributes#put(java.lang.String, java.lang.Object)}.
- */
- @Test
- public void testPutStringObject()
- {
- Attributes attributes = new Attributes();
- attributes.set(null, null);
- assertEquals(null, attributes.get(null));
- attributes.set("", null);
- assertEquals(null, attributes.get(""));
- attributes.set("test", null);
- assertEquals(null, attributes.get("test"));
- attributes.set("test", Integer.valueOf(456));
- assertEquals(Integer.valueOf(456), attributes.get("test"));
- }
-
- /**
* Test method for {@link org.apache.empire.commons.Attributes#set(java.lang.String, java.lang.Object)}.
*/
@Test
Modified: empire-db/trunk/pom.xml
URL: http://svn.apache.org/viewvc/empire-db/trunk/pom.xml?rev=1607865&r1=1607864&r2=1607865&view=diff
==============================================================================
--- empire-db/trunk/pom.xml (original)
+++ empire-db/trunk/pom.xml Fri Jul 4 14:27:47 2014
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>13</version>
+ <version>14</version>
</parent>
<groupId>org.apache.empire-db</groupId>
@@ -101,20 +101,7 @@
</execution>
</executions>
</plugin>
- <!-- enable enforcer for java 1.5 --><!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-versions</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- --></plugins>
+ </plugins>
</build>
</profile>
<profile>
@@ -138,7 +125,7 @@
</execution>
</executions>
</plugin>
- <!-- enable enforcer for java 1.5 -->
+ <!-- enable enforcer for java 1.6 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -384,6 +371,10 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
</plugins>
<pluginManagement>
@@ -399,6 +390,8 @@
<exclude>release.properties</exclude>
<exclude>**/target/**</exclude>
<exclude>**/dependencies.txt</exclude>
+ <exclude>**/.idea/**</exclude>
+ <exclude>**/*.iml</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/.project</exclude>
<exclude>**/.classpath</exclude>
@@ -421,11 +414,11 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>3.1</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
- <optimise>true</optimise>
+ <optimize>true</optimize>
<debug>true</debug>
</configuration>
</plugin>
@@ -433,7 +426,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5</version>
<configuration>
<useDefaultManifestFile>true</useDefaultManifestFile>
<archive>
@@ -469,6 +462,9 @@
<include>src/**</include>
<include>**/*.xml</include>
</includes>
+ <excludes>
+ <exclude>**/.idea/**</exclude>
+ </excludes>
<encoding>UTF-8</encoding>
</configuration>
<executions>
@@ -479,11 +475,11 @@
</execution>
</executions>
</plugin>
- <!-- When enforcer enabled this will make sure we compile using java 1.6.x using maven 2.x -->
+ <!-- When enforcer enabled this will make sure we compile using java 1.6.x using maven 3.x -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.3.1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -493,7 +489,7 @@
<configuration>
<rules>
<requireMavenVersion>
- <version>[2.0.0,3.0.0)</version>
+ <version>[3.0.0,)</version>
</requireMavenVersion>
<requireJavaVersion>
<version>[1.6,1.7)</version>
@@ -507,7 +503,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.11</version>
<executions>
<execution>
<id>check-api</id>
@@ -528,7 +524,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<configuration>
<downloadSources>true</downloadSources>
<!-- downloadJavadocs>true</downloadJavadocs -->
@@ -537,7 +533,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.7</version>
+ <version>2.5.0</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -558,7 +554,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.1</version>
+ <version>2.17</version>
<configuration>
<systemPropertyVariables>
<derby.stream.error.file>target/derby.log</derby.stream.error.file>
@@ -570,39 +566,57 @@
</build>
<reporting>
+ <excludeDefaults>true</excludeDefaults>
+ <outputDirectory>${project.build.directory}/site</outputDirectory>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.7</version>
+ <configuration>
+ <dependencyDetailsEnabled>false</dependencyDetailsEnabled>
+ <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+ </configuration>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
+ <version>3.1</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
</plugin>
- <plugin>
+ <!--Findbugs is broken in Java 8-->
+ <!--<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.5.4</version>
<configuration>
<findbugsXmlOutput>true</findbugsXmlOutput>
<xmlOutput>true</xmlOutput>
<omitVisitors>SerializableIdiom</omitVisitors>
</configuration>
- </plugin>
+ </plugin>-->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jdepend-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
+ <version>2.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -618,17 +632,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changelog-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
</plugins>
</reporting>