You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2008/05/06 20:51:32 UTC
svn commit: r653881 [1/2] - in /tapestry/tapestry5/trunk:
tapestry-component-report/src/main/java/org/apache/tapestry/mojo/
tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/
tapestry-hibernate/src/site/apt/ tapestry-hibernate/src...
Author: hlship
Date: Tue May 6 11:51:27 2008
New Revision: 653881
URL: http://svn.apache.org/viewvc?rev=653881&view=rev
Log:
Remove leading underscores from field names
Removed:
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/data/Address.java
Modified:
tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/CommitAfterWorker.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/EntityPersistentFieldStrategy.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionManagerImpl.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImpl.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/ImmutableConfiguration.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/PackageNameHibernateConfigurer.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImplTest.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java
tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java
tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt
tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/AbstractIntegrationTestSuite.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/ErrorReportingCommandProcessor.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/JettyRunner.java
tapestry/tapestry5/trunk/tapestry-test/src/main/java/org/apache/tapestry/test/RandomDataSource.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/components/Upload.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartDecoderImpl.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/MultipartServletRequestFilter.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParameterValue.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/ParametersServletRequestWrapper.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/internal/services/UploadedFileItem.java
tapestry/tapestry5/trunk/tapestry-upload/src/main/java/org/apache/tapestry/upload/services/UploadModule.java
tapestry/tapestry5/trunk/tapestry-upload/src/site/apt/index.apt
tapestry/tapestry5/trunk/tapestry-upload/src/test/java/org/example/upload/pages/Start.java
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ClassDescription.java Tue May 6 11:51:27 2008
@@ -20,39 +20,39 @@
public class ClassDescription
{
- private final String _superClassName;
+ private final String superClassName;
- private final String _className;
+ private final String className;
- private final String _description;
+ private final String description;
- private final Map<String, ParameterDescription> _parameters = newMap();
+ private final Map<String, ParameterDescription> parameters = newMap();
public ClassDescription(String className, String superClassName, String description)
{
- _className = className;
- _superClassName = superClassName;
- _description = description;
+ this.className = className;
+ this.superClassName = superClassName;
+ this.description = description;
}
public String getClassName()
{
- return _className;
+ return className;
}
public String getDescription()
{
- return _description;
+ return description;
}
public Map<String, ParameterDescription> getParameters()
{
- return _parameters;
+ return parameters;
}
public String getSuperClassName()
{
- return _superClassName;
+ return superClassName;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParameterDescription.java Tue May 6 11:51:27 2008
@@ -16,65 +16,65 @@
public class ParameterDescription
{
- private final String _name;
+ private final String name;
- private final String _type;
+ private final String type;
- private final String _defaultValue;
+ private final String defaultValue;
- private final String _defaultPrefix;
+ private final String defaultPrefix;
- private final boolean _required;
+ private final boolean required;
- private final boolean _cache;
+ private final boolean cache;
- private final String _description;
+ private final String description;
public ParameterDescription(String name, String type, String defaultValue,
String defaultPrefix, boolean required, boolean cache, String description)
{
- _name = name;
- _type = type;
- _defaultValue = defaultValue;
- _defaultPrefix = defaultPrefix;
- _required = required;
- _cache = cache;
- _description = description;
+ this.name = name;
+ this.type = type;
+ this.defaultValue = defaultValue;
+ this.defaultPrefix = defaultPrefix;
+ this.required = required;
+ this.cache = cache;
+ this.description = description;
}
public boolean getCache()
{
- return _cache;
+ return cache;
}
public String getDefaultPrefix()
{
- return _defaultPrefix;
+ return defaultPrefix;
}
public String getDefaultValue()
{
- return _defaultValue;
+ return defaultValue;
}
public String getDescription()
{
- return _description;
+ return description;
}
public String getName()
{
- return _name;
+ return name;
}
public boolean getRequired()
{
- return _required;
+ return required;
}
public String getType()
{
- return _type;
+ return type;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java (original)
+++ tapestry/tapestry5/trunk/tapestry-component-report/src/main/java/org/apache/tapestry/mojo/ParametersDoclet.java Tue May 6 11:51:27 2008
@@ -33,11 +33,11 @@
{
static String OUTPUT_PATH_OPTION = "-o";
- static String _outputPath;
+ static String outputPath;
static class Worker
{
- private PrintWriter _out;
+ private PrintWriter out;
private final Pattern _stripper = Pattern.compile("(<.*?>|&.*?;)", Pattern.DOTALL);
@@ -45,7 +45,7 @@
{
File output = new File(outputPath);
- _out = new PrintWriter(output);
+ out = new PrintWriter(output);
println("<component-parameters>");
@@ -54,7 +54,7 @@
println("</component-parameters>");
- _out.close();
+ out.close();
}
private void emitClass(ClassDoc classDoc)
@@ -142,14 +142,14 @@
{
String line = String.format(format, arguments);
- _out.print(line);
+ out.print(line);
}
private void println(String format, Object... arguments)
{
print(format, arguments);
- _out.println();
+ out.println();
}
private void printDescription(Doc holder)
@@ -193,7 +193,7 @@
String stripped = _stripper.matcher(text).replaceAll("");
- _out.print(stripped);
+ out.print(stripped);
}
}
@@ -216,13 +216,13 @@
{
for (String[] group : options)
{
- if (group[0].equals(OUTPUT_PATH_OPTION)) _outputPath = group[1];
+ if (group[0].equals(OUTPUT_PATH_OPTION)) outputPath = group[1];
// Do we need to check for other unexpected options?
// TODO: Check for duplicate -o?
}
- if (_outputPath == null) reporter.printError(String.format("Usage: javadoc %s path", OUTPUT_PATH_OPTION));
+ if (outputPath == null) reporter.printError(String.format("Usage: javadoc %s path", OUTPUT_PATH_OPTION));
return true;
}
@@ -233,7 +233,7 @@
try
{
- new Worker().run(_outputPath, root);
+ new Worker().run(outputPath, root);
}
catch (Exception ex)
{
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/CommitAfterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/CommitAfterWorker.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/CommitAfterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/CommitAfterWorker.java Tue May 6 11:51:27 2008
@@ -26,9 +26,9 @@
*/
public class CommitAfterWorker implements ComponentClassTransformWorker
{
- private final HibernateSessionManager _manager;
+ private final HibernateSessionManager manager;
- private final ComponentMethodAdvice _advice = new ComponentMethodAdvice()
+ private final ComponentMethodAdvice advice = new ComponentMethodAdvice()
{
public void advise(ComponentMethodInvocation invocation)
{
@@ -38,11 +38,11 @@
// Success or checked exception:
- _manager.commit();
+ manager.commit();
}
catch (RuntimeException ex)
{
- _manager.abort();
+ manager.abort();
throw ex;
}
@@ -51,14 +51,14 @@
public CommitAfterWorker(HibernateSessionManager manager)
{
- _manager = manager;
+ this.manager = manager;
}
public void transform(ClassTransformation transformation, MutableComponentModel model)
{
for (TransformMethodSignature sig : transformation.findMethodsWithAnnotation(CommitAfter.class))
{
- transformation.advise(sig, _advice);
+ transformation.advise(sig, advice);
}
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/EntityPersistentFieldStrategy.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/EntityPersistentFieldStrategy.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/EntityPersistentFieldStrategy.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/EntityPersistentFieldStrategy.java Tue May 6 11:51:27 2008
@@ -14,11 +14,6 @@
package org.apache.tapestry.internal.hibernate;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.apache.tapestry.internal.services.AbstractSessionPersistentFieldStrategy;
import org.apache.tapestry.internal.services.PersistentFieldChangeImpl;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
@@ -31,81 +26,108 @@
import org.hibernate.Session;
import org.hibernate.metadata.ClassMetadata;
-/** Persists Hibernate entities by storing their id in the session. */
-public class EntityPersistentFieldStrategy implements PersistentFieldStrategy {
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Persists Hibernate entities by storing their id in the session.
+ */
+public class EntityPersistentFieldStrategy implements PersistentFieldStrategy
+{
private static final Pattern KEY_PATTERN = Pattern.compile("^([^:]+):([^:]+):(.+)$");
-
- private final PersistentFieldStrategy _strategy;
- private final Session _session;
- private final TypeCoercer _typeCoercer;
-
- public EntityPersistentFieldStrategy(Session session, TypeCoercer typeCoercer, Request request) {
- super();
- _strategy = new EntityStrategy(request);
- _session = session;
- _typeCoercer = typeCoercer;
- }
-
- public void discardChanges(String pageName) {
- _strategy.discardChanges(pageName);
- }
-
- public Collection<PersistentFieldChange> gatherFieldChanges(String pageName) {
- Collection<PersistentFieldChange> changes = CollectionFactory.newList();
- for(PersistentFieldChange change : _strategy.gatherFieldChanges(pageName)) {
- if (change.getValue() == null) {
- changes.add(change);
- continue;
- }
-
- String key = change.getValue().toString();
- Matcher matcher = KEY_PATTERN.matcher(key);
- matcher.matches();
-
- String entityName = matcher.group(1);
- String idClassName = matcher.group(2);
- String stringId = matcher.group(3);
-
- try {
- Class<?> idClass = Class.forName(idClassName);
- Object idObj = _typeCoercer.coerce(stringId, idClass);
-
- Serializable id = Defense.cast(idObj, Serializable.class, "id");
- Object entity = _session.get(entityName, id);
- changes.add(new PersistentFieldChangeImpl(change.getComponentId(), change.getFieldName(), entity));
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(HibernateMessages.badEntityIdType(entityName, idClassName, stringId), e);
- }
- }
-
- return changes;
- }
-
- /** Stores the entity id's as values in the form: entityName:idClass:id */
- public void postChange(String pageName, String componentId, String fieldName, Object newValue) {
- if (newValue != null) {
- try {
- String entityName = _session.getEntityName(newValue);
- ClassMetadata metadata = _session.getSessionFactory().getClassMetadata(newValue.getClass());
- Serializable id = metadata.getIdentifier(newValue, _session.getEntityMode());
- newValue = entityName + ":" + id.getClass().getCanonicalName() + ":" + _typeCoercer.coerce(id, String.class);
-
- } catch (HibernateException e) {
- throw new IllegalArgumentException(HibernateMessages.entityNotAttached(newValue), e);
- }
- }
-
- _strategy.postChange(pageName, componentId, fieldName, newValue);
- }
-
- /** We want to store the data in the session normally, we just need to control the values.
- * We also need a separate instance so that we know it's using the right prefix for the values.
- */
- private static final class EntityStrategy extends AbstractSessionPersistentFieldStrategy {
-
- public EntityStrategy(Request request) {
- super("entity:", request);
- }
-
- }
+
+ private final PersistentFieldStrategy strategy;
+ private final Session session;
+ private final TypeCoercer typeCoercer;
+
+ public EntityPersistentFieldStrategy(Session session, TypeCoercer typeCoercer, Request request)
+ {
+ strategy = new EntityStrategy(request);
+ this.session = session;
+ this.typeCoercer = typeCoercer;
+ }
+
+ public void discardChanges(String pageName)
+ {
+ strategy.discardChanges(pageName);
+ }
+
+ public Collection<PersistentFieldChange> gatherFieldChanges(String pageName)
+ {
+ Collection<PersistentFieldChange> changes = CollectionFactory.newList();
+
+ for (PersistentFieldChange change : strategy.gatherFieldChanges(pageName))
+ {
+ if (change.getValue() == null)
+ {
+ changes.add(change);
+ continue;
+ }
+
+ String key = change.getValue().toString();
+ Matcher matcher = KEY_PATTERN.matcher(key);
+ matcher.matches();
+
+ String entityName = matcher.group(1);
+ String idClassName = matcher.group(2);
+ String stringId = matcher.group(3);
+
+ try
+ {
+ Class<?> idClass = Class.forName(idClassName);
+ Object idObj = typeCoercer.coerce(stringId, idClass);
+
+ Serializable id = Defense.cast(idObj, Serializable.class, "id");
+ Object entity = session.get(entityName, id);
+ changes.add(new PersistentFieldChangeImpl(change.getComponentId(), change.getFieldName(), entity));
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new RuntimeException(HibernateMessages.badEntityIdType(entityName, idClassName, stringId), e);
+ }
+ }
+
+ return changes;
+ }
+
+ /**
+ * Stores the entity id's as values in the form: entityName:idClass:id
+ */
+ public void postChange(String pageName, String componentId, String fieldName, Object newValue)
+ {
+ if (newValue != null)
+ {
+ try
+ {
+ String entityName = session.getEntityName(newValue);
+ ClassMetadata metadata = session.getSessionFactory().getClassMetadata(newValue.getClass());
+ Serializable id = metadata.getIdentifier(newValue, session.getEntityMode());
+ newValue = entityName + ":" + id.getClass().getCanonicalName() + ":" + typeCoercer.coerce(id,
+ String.class);
+
+ }
+ catch (HibernateException e)
+ {
+ throw new IllegalArgumentException(HibernateMessages.entityNotAttached(newValue), e);
+ }
+ }
+
+ strategy.postChange(pageName, componentId, fieldName, newValue);
+ }
+
+ /**
+ * We want to store the data in the session normally, we just need to control the values. We also need a separate
+ * instance so that we know it's using the right prefix for the values.
+ */
+ private static final class EntityStrategy extends AbstractSessionPersistentFieldStrategy
+ {
+
+ public EntityStrategy(Request request)
+ {
+ super("entity:", request);
+ }
+
+ }
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionManagerImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionManagerImpl.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionManagerImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionManagerImpl.java Tue May 6 11:51:27 2008
@@ -22,32 +22,32 @@
public class HibernateSessionManagerImpl implements HibernateSessionManager, ThreadCleanupListener
{
- private final Session _session;
+ private final Session session;
- private Transaction _transaction;
+ private Transaction transaction;
public HibernateSessionManagerImpl(HibernateSessionSource source)
{
- _session = source.create();
+ session = source.create();
- _transaction = _session.beginTransaction();
+ transaction = session.beginTransaction();
}
public void abort()
{
- _transaction.rollback();
- _transaction.begin();
+ transaction.rollback();
+ transaction.begin();
}
public void commit()
{
- _transaction.commit();
- _transaction.begin();
+ transaction.commit();
+ transaction.begin();
}
public Session getSession()
{
- return _session;
+ return session;
}
/**
@@ -57,9 +57,9 @@
*/
public void threadDidCleanup()
{
- _transaction.rollback();
+ transaction.rollback();
- _session.close();
+ session.close();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImpl.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImpl.java Tue May 6 11:51:27 2008
@@ -27,8 +27,9 @@
public class HibernateSessionSourceImpl implements HibernateSessionSource, RegistryShutdownListener
{
- private final SessionFactory _sessionFactory;
- private final Configuration _configuration;
+ private final SessionFactory sessionFactory;
+
+ private final Configuration configuration;
public HibernateSessionSourceImpl(Logger logger, List<HibernateConfigurer> hibernateConfigurers)
{
@@ -41,8 +42,8 @@
long configurationComplete = System.currentTimeMillis();
- _sessionFactory = configuration.buildSessionFactory();
- _configuration = new ImmutableConfiguration(configuration);
+ sessionFactory = configuration.buildSessionFactory();
+ this.configuration = new ImmutableConfiguration(configuration);
long factoryCreated = System.currentTimeMillis();
@@ -51,29 +52,29 @@
factoryCreated - startTime));
logger
- .info(HibernateMessages.entityCatalog(_sessionFactory.getAllClassMetadata()
+ .info(HibernateMessages.entityCatalog(sessionFactory.getAllClassMetadata()
.keySet()));
}
public Session create()
{
- return _sessionFactory.openSession();
+ return sessionFactory.openSession();
}
public SessionFactory getSessionFactory()
{
- return _sessionFactory;
+ return sessionFactory;
}
public Configuration getConfiguration()
{
- return _configuration;
+ return configuration;
}
public void registryDidShutdown()
{
- _sessionFactory.close();
+ sessionFactory.close();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImpl.java Tue May 6 11:51:27 2008
@@ -27,9 +27,9 @@
public class HibernateTransactionDecoratorImpl implements HibernateTransactionDecorator
{
- private final AspectDecorator _aspectDecorator;
+ private final AspectDecorator aspectDecorator;
- private final HibernateSessionManager _manager;
+ private final HibernateSessionManager manager;
/**
* The rules for advice are the same for any method: commit on success or checked exception, abort on thrown
@@ -45,22 +45,22 @@
}
catch (RuntimeException ex)
{
- _manager.abort();
+ manager.abort();
throw ex;
}
// For success or checked exception, commit the transaction.
- _manager.commit();
+ manager.commit();
}
};
public HibernateTransactionDecoratorImpl(AspectDecorator aspectDecorator, HibernateSessionManager manager)
{
- _aspectDecorator = aspectDecorator;
+ this.aspectDecorator = aspectDecorator;
- _manager = manager;
+ this.manager = manager;
}
public <T> T build(Class<T> serviceInterface, T delegate, String serviceId)
@@ -73,7 +73,7 @@
serviceId,
serviceInterface.getName());
- AspectInterceptorBuilder<T> builder = _aspectDecorator.createBuilder(serviceInterface, delegate, description);
+ AspectInterceptorBuilder<T> builder = aspectDecorator.createBuilder(serviceInterface, delegate, description);
for (Method m : serviceInterface.getMethods())
{
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/ImmutableConfiguration.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/ImmutableConfiguration.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/ImmutableConfiguration.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/ImmutableConfiguration.java Tue May 6 11:51:27 2008
@@ -14,13 +14,6 @@
package org.apache.tapestry.internal.hibernate;
-import java.io.File;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
import org.dom4j.Document;
import org.hibernate.HibernateException;
import org.hibernate.Interceptor;
@@ -42,380 +35,464 @@
import org.hibernate.tool.hbm2ddl.DatabaseMetadata;
import org.xml.sax.EntityResolver;
-/** Delegates all method calls to another instance.
- * Any calls that modify state or return objects that are
- * meant to be used to change state will throw an {@link UnsupportedOperationException}.
- * This class is specifically final because there are protected methods that
- * cannot be called on the contained instance (because they are protected).
- * <p>
- * Note that this class does not guarantee that the objects returned are mutable
- * thus changes to the configuration are still possible.
+import java.io.File;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Delegates all method calls to another instance. Any calls that modify state or return objects that are meant to be
+ * used to change state will throw an {@link UnsupportedOperationException}. This class is specifically final because
+ * there are protected methods that cannot be called on the contained instance (because they are protected).
+ * <p/>
+ * Note that this class does not guarantee that the objects returned are mutable thus changes to the configuration are
+ * still possible.
*/
@SuppressWarnings("unchecked")
-final class ImmutableConfiguration extends Configuration {
- private static final long serialVersionUID = -4039250481581260132L;
-
- private final Configuration _config;
-
- public ImmutableConfiguration(Configuration configuration) {
- _config = configuration;
- }
-
- @Override
- protected void add(Document doc) throws MappingException {
- unsupported();
- }
-
- /** Throws an exception. Has a return value for convenience.
- * @return nothing because it always throws an exception
- */
- private <T> T unsupported() {
- throw new UnsupportedOperationException(HibernateMessages.configurationImmutable());
- }
-
- @Override
- public void addAuxiliaryDatabaseObject(AuxiliaryDatabaseObject object) {
- unsupported();
- }
-
- @Override
- public Configuration addCacheableFile(File xmlFile) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addCacheableFile(String xmlFile) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addClass(Class persistentClass) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addDirectory(File dir) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addDocument(org.w3c.dom.Document doc) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addFile(File xmlFile) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addFile(String xmlFile) throws MappingException {
- return unsupported();
- }
-
- @Override
- public void addFilterDefinition(FilterDefinition definition) {
- unsupported();
- }
-
- @Override
- public Configuration addInputStream(InputStream xmlInputStream) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addJar(File jar) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addProperties(Properties extraProperties) {
- return unsupported();
- }
-
- @Override
- public Configuration addResource(String resourceName, ClassLoader classLoader) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addResource(String resourceName) throws MappingException {
- return unsupported();
- }
-
- @Override
- public void addSqlFunction(String functionName, SQLFunction function) {
- unsupported();
- }
-
- @Override
- public Configuration addURL(URL url) throws MappingException {
- return unsupported();
- }
-
- @Override
- public Configuration addXML(String xml) throws MappingException {
- return unsupported();
- }
-
- /* Since this is called from the constructor of the superclass, it calls
- * the superclass method rather than delegating to the contained instance.
- * We could also just not override the method but for completeness I'll
- * leave it in.
- * It's unfortunate that Configuration isn't an interface.
- */
- @Override
- public Mapping buildMapping() {
- return super.buildMapping();
- }
-
- @Override
- public void buildMappings() {
- _config.buildMappings();
- }
-
- @Override
- public SessionFactory buildSessionFactory() throws HibernateException {
- return _config.buildSessionFactory();
- }
-
- @Override
- public Settings buildSettings() throws HibernateException {
- return _config.buildSettings();
- }
-
- @Override
- public Settings buildSettings(Properties props) throws HibernateException {
- return _config.buildSettings(props);
- }
-
- @Override
- public Configuration configure() throws HibernateException {
- return unsupported();
- }
-
- @Override
- public Configuration configure(org.w3c.dom.Document document) throws HibernateException {
- return unsupported();
- }
-
- @Override
- public Configuration configure(File configFile) throws HibernateException {
- return unsupported();
- }
-
- @Override
- public Configuration configure(String resource) throws HibernateException {
- return unsupported();
- }
-
- @Override
- public Configuration configure(URL url) throws HibernateException {
- return unsupported();
- }
-
- @Override
- public Mappings createMappings() {
- return unsupported();
- }
-
- @Override
- protected Configuration doConfigure(Document doc) throws HibernateException {
- return unsupported();
- }
-
- @Override
- protected Configuration doConfigure(InputStream stream, String resourceName) throws HibernateException {
- return unsupported();
- }
-
- @Override
- protected Document findPossibleExtends() {
- return unsupported();
- }
-
- @Override
- public String[] generateDropSchemaScript(Dialect dialect) throws HibernateException {
- return _config.generateDropSchemaScript(dialect);
- }
-
- @Override
- public String[] generateSchemaCreationScript(Dialect dialect) throws HibernateException {
- return _config.generateSchemaCreationScript(dialect);
- }
-
- @Override
- public String[] generateSchemaUpdateScript(Dialect dialect, DatabaseMetadata databaseMetadata) throws HibernateException {
- return _config.generateSchemaUpdateScript(dialect, databaseMetadata);
- }
-
- @Override
- public PersistentClass getClassMapping(String entityName) {
- return _config.getClassMapping(entityName);
- }
-
- @Override
- public Iterator getClassMappings() {
- return _config.getClassMappings();
- }
-
- @Override
- public Collection getCollectionMapping(String role) {
- return _config.getCollectionMapping(role);
- }
-
- @Override
- public Iterator getCollectionMappings() {
- return _config.getCollectionMappings();
- }
-
- @Override
- public EntityNotFoundDelegate getEntityNotFoundDelegate() {
- return _config.getEntityNotFoundDelegate();
- }
-
- @Override
- public EntityResolver getEntityResolver() {
- return _config.getEntityResolver();
- }
-
- @Override
- public EventListeners getEventListeners() {
- return _config.getEventListeners();
- }
-
- @Override
- public Map getFilterDefinitions() {
- return _config.getFilterDefinitions();
- }
-
- @Override
- public Map getImports() {
- return _config.getImports();
- }
-
- @Override
- public Interceptor getInterceptor() {
- return _config.getInterceptor();
- }
-
- @Override
- public Map getNamedQueries() {
- return _config.getNamedQueries();
- }
-
- @Override
- public Map getNamedSQLQueries() {
- return _config.getNamedSQLQueries();
- }
-
- @Override
- public NamingStrategy getNamingStrategy() {
- return _config.getNamingStrategy();
- }
-
- @Override
- public Properties getProperties() {
- return _config.getProperties();
- }
-
- @Override
- public String getProperty(String propertyName) {
- return _config.getProperty(propertyName);
- }
-
- @Override
- public Map getSqlFunctions() {
- return _config.getSqlFunctions();
- }
-
- @Override
- public Map getSqlResultSetMappings() {
- return _config.getSqlResultSetMappings();
- }
-
- @Override
- public Iterator getTableMappings() {
- return _config.getTableMappings();
- }
-
- @Override
- public Configuration mergeProperties(Properties properties) {
- return unsupported();
- }
-
- @Override
- public void setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String region) throws MappingException {
- unsupported();
- }
-
- @Override
- public Configuration setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy) throws MappingException {
- return unsupported();
- }
-
- @Override
- public void setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy, String region) throws MappingException {
- unsupported();
- }
-
- @Override
- public Configuration setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy) throws MappingException {
- return unsupported();
- }
-
- @Override
- public void setEntityNotFoundDelegate(EntityNotFoundDelegate entityNotFoundDelegate) {
- unsupported();
- }
-
- @Override
- public void setEntityResolver(EntityResolver entityResolver) {
- unsupported();
- }
-
- @Override
- public Configuration setInterceptor(Interceptor interceptor) {
- return unsupported();
- }
-
- @Override
- public void setListener(String type, Object listener) {
- unsupported();
- }
-
- @Override
- public void setListeners(String type, Object[] listeners) {
- unsupported();
- }
-
- @Override
- public void setListeners(String type, String[] listenerClasses) {
- unsupported();
- }
-
- @Override
- public Configuration setNamingStrategy(NamingStrategy namingStrategy) {
- return unsupported();
- }
-
- @Override
- public Configuration setProperties(Properties properties) {
- return unsupported();
- }
-
- @Override
- public Configuration setProperty(String propertyName, String value) {
- return unsupported();
- }
-
- @Override
- public void validateSchema(Dialect dialect, DatabaseMetadata databaseMetadata) throws HibernateException {
- _config.validateSchema(dialect, databaseMetadata);
- }
-
- @Override
- public String toString() {
- return "ImmutableConfiguration[" + _config + "]";
+final class ImmutableConfiguration extends Configuration
+{
+ private static final long serialVersionUID = -4039250481581260132L;
+
+ private final Configuration config;
+
+ public ImmutableConfiguration(Configuration configuration)
+ {
+ config = configuration;
+ }
+
+ @Override
+ protected void add(Document doc) throws MappingException
+ {
+ unsupported();
+ }
+
+ /**
+ * Throws an exception. Has a return value for convenience.
+ *
+ * @return nothing because it always throws an exception
+ */
+ private <T> T unsupported()
+ {
+ throw new UnsupportedOperationException(HibernateMessages.configurationImmutable());
+ }
+
+ @Override
+ public void addAuxiliaryDatabaseObject(AuxiliaryDatabaseObject object)
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration addCacheableFile(File xmlFile) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addCacheableFile(String xmlFile) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addClass(Class persistentClass) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addDirectory(File dir) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addDocument(org.w3c.dom.Document doc) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addFile(File xmlFile) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addFile(String xmlFile) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void addFilterDefinition(FilterDefinition definition)
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration addInputStream(InputStream xmlInputStream) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addJar(File jar) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addProperties(Properties extraProperties)
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addResource(String resourceName, ClassLoader classLoader) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addResource(String resourceName) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void addSqlFunction(String functionName, SQLFunction function)
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration addURL(URL url) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration addXML(String xml) throws MappingException
+ {
+ return unsupported();
+ }
+
+ /* Since this is called from the constructor of the superclass, it calls
+ * the superclass method rather than delegating to the contained instance.
+ * We could also just not override the method but for completeness I'll
+ * leave it in.
+ * It's unfortunate that Configuration isn't an interface.
+ */
+ @Override
+ public Mapping buildMapping()
+ {
+ return super.buildMapping();
+ }
+
+ @Override
+ public void buildMappings()
+ {
+ config.buildMappings();
+ }
+
+ @Override
+ public SessionFactory buildSessionFactory() throws HibernateException
+ {
+ return config.buildSessionFactory();
+ }
+
+ @Override
+ public Settings buildSettings() throws HibernateException
+ {
+ return config.buildSettings();
+ }
+
+ @Override
+ public Settings buildSettings(Properties props) throws HibernateException
+ {
+ return config.buildSettings(props);
+ }
+
+ @Override
+ public Configuration configure() throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration configure(org.w3c.dom.Document document) throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration configure(File configFile) throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration configure(String resource) throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration configure(URL url) throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Mappings createMappings()
+ {
+ return unsupported();
+ }
+
+ @Override
+ protected Configuration doConfigure(Document doc) throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ protected Configuration doConfigure(InputStream stream, String resourceName) throws HibernateException
+ {
+ return unsupported();
+ }
+
+ @Override
+ protected Document findPossibleExtends()
+ {
+ return unsupported();
+ }
+
+ @Override
+ public String[] generateDropSchemaScript(Dialect dialect) throws HibernateException
+ {
+ return config.generateDropSchemaScript(dialect);
+ }
+
+ @Override
+ public String[] generateSchemaCreationScript(Dialect dialect) throws HibernateException
+ {
+ return config.generateSchemaCreationScript(dialect);
+ }
+
+ @Override
+ public String[] generateSchemaUpdateScript(Dialect dialect, DatabaseMetadata databaseMetadata)
+ throws HibernateException
+ {
+ return config.generateSchemaUpdateScript(dialect, databaseMetadata);
+ }
+
+ @Override
+ public PersistentClass getClassMapping(String entityName)
+ {
+ return config.getClassMapping(entityName);
+ }
+
+ @Override
+ public Iterator getClassMappings()
+ {
+ return config.getClassMappings();
+ }
+
+ @Override
+ public Collection getCollectionMapping(String role)
+ {
+ return config.getCollectionMapping(role);
+ }
+
+ @Override
+ public Iterator getCollectionMappings()
+ {
+ return config.getCollectionMappings();
+ }
+
+ @Override
+ public EntityNotFoundDelegate getEntityNotFoundDelegate()
+ {
+ return config.getEntityNotFoundDelegate();
+ }
+
+ @Override
+ public EntityResolver getEntityResolver()
+ {
+ return config.getEntityResolver();
+ }
+
+ @Override
+ public EventListeners getEventListeners()
+ {
+ return config.getEventListeners();
+ }
+
+ @Override
+ public Map getFilterDefinitions()
+ {
+ return config.getFilterDefinitions();
+ }
+
+ @Override
+ public Map getImports()
+ {
+ return config.getImports();
+ }
+
+ @Override
+ public Interceptor getInterceptor()
+ {
+ return config.getInterceptor();
+ }
+
+ @Override
+ public Map getNamedQueries()
+ {
+ return config.getNamedQueries();
+ }
+
+ @Override
+ public Map getNamedSQLQueries()
+ {
+ return config.getNamedSQLQueries();
+ }
+
+ @Override
+ public NamingStrategy getNamingStrategy()
+ {
+ return config.getNamingStrategy();
+ }
+
+ @Override
+ public Properties getProperties()
+ {
+ return config.getProperties();
+ }
+
+ @Override
+ public String getProperty(String propertyName)
+ {
+ return config.getProperty(propertyName);
+ }
+
+ @Override
+ public Map getSqlFunctions()
+ {
+ return config.getSqlFunctions();
+ }
+
+ @Override
+ public Map getSqlResultSetMappings()
+ {
+ return config.getSqlResultSetMappings();
+ }
+
+ @Override
+ public Iterator getTableMappings()
+ {
+ return config.getTableMappings();
+ }
+
+ @Override
+ public Configuration mergeProperties(Properties properties)
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy, String region)
+ throws MappingException
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration setCacheConcurrencyStrategy(String clazz, String concurrencyStrategy) throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy, String region)
+ throws MappingException
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration setCollectionCacheConcurrencyStrategy(String collectionRole, String concurrencyStrategy)
+ throws MappingException
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void setEntityNotFoundDelegate(EntityNotFoundDelegate entityNotFoundDelegate)
+ {
+ unsupported();
+ }
+
+ @Override
+ public void setEntityResolver(EntityResolver entityResolver)
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration setInterceptor(Interceptor interceptor)
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void setListener(String type, Object listener)
+ {
+ unsupported();
+ }
+
+ @Override
+ public void setListeners(String type, Object[] listeners)
+ {
+ unsupported();
+ }
+
+ @Override
+ public void setListeners(String type, String[] listenerClasses)
+ {
+ unsupported();
+ }
+
+ @Override
+ public Configuration setNamingStrategy(NamingStrategy namingStrategy)
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration setProperties(Properties properties)
+ {
+ return unsupported();
+ }
+
+ @Override
+ public Configuration setProperty(String propertyName, String value)
+ {
+ return unsupported();
+ }
+
+ @Override
+ public void validateSchema(Dialect dialect, DatabaseMetadata databaseMetadata) throws HibernateException
+ {
+ config.validateSchema(dialect, databaseMetadata);
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ImmutableConfiguration[" + config + "]";
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/PackageNameHibernateConfigurer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/PackageNameHibernateConfigurer.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/PackageNameHibernateConfigurer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/main/java/org/apache/tapestry/internal/hibernate/PackageNameHibernateConfigurer.java Tue May 6 11:51:27 2008
@@ -26,15 +26,15 @@
*/
public final class PackageNameHibernateConfigurer implements HibernateConfigurer
{
- private final HibernateEntityPackageManager _packageManager;
+ private final HibernateEntityPackageManager packageManager;
- private final ClassNameLocator _classNameLocator;
+ private final ClassNameLocator classNameLocator;
public PackageNameHibernateConfigurer(HibernateEntityPackageManager packageManager,
ClassNameLocator classNameLocator)
{
- _packageManager = packageManager;
- _classNameLocator = classNameLocator;
+ this.packageManager = packageManager;
+ this.classNameLocator = classNameLocator;
}
public void configure(Configuration configuration)
@@ -44,11 +44,11 @@
ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- for (String packageName : _packageManager.getPackageNames())
+ for (String packageName : packageManager.getPackageNames())
{
cfg.addPackage(packageName);
- for (String className : _classNameLocator.locateClassNames(packageName))
+ for (String className : classNameLocator.locateClassNames(packageName))
{
try
{
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/site/apt/userguide.apt Tue May 6 11:51:27 2008
@@ -12,16 +12,16 @@
public class ViewPerson
{
@Property
- private Person _person;
+ private Person person;
void onActivate(Person person)
{
- _person = person;
+ this.person = person;
}
Person onPassivate()
{
- return _person;
+ return person;
}
}
+----+
@@ -45,11 +45,11 @@
{
@Persist("entity")
@Property
- private Person _person;
+ private Person person;
void onActivate(Person person)
{
- _person = person;
+ this.person = person;
}
}
@@ -70,22 +70,22 @@
{
@Persist("entity")
@Property
- private Person _person;
+ private Person person;
@InjectPage
- private PersonIndex _personIndex;
+ private PersonIndex personIndex;
void onActivate(Person person)
{
- _person = person;
+ this.person = person;
}
- Object onPassivate() { return _person; }
+ Object onPassivate() { return person; }
@CommitAfter
Object onSuccess()
{
- return _personIndex;
+ return personIndex;
}
}
+----+
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateSessionSourceImplTest.java Tue May 6 11:51:27 2008
@@ -34,7 +34,7 @@
public class HibernateSessionSourceImplTest extends TapestryTestCase
{
- private final Logger _log = LoggerFactory
+ private final Logger log = LoggerFactory
.getLogger("tapestry.hibernate.HibernateSessionSourceTest");
@Test
@@ -51,7 +51,7 @@
new PackageNameHibernateConfigurer(packageManager, new ClassNameLocatorImpl()));
replay();
- HibernateSessionSource source = new HibernateSessionSourceImpl(_log, filters);
+ HibernateSessionSource source = new HibernateSessionSourceImpl(log, filters);
Session session = source.create();
assertNotNull(session);
@@ -74,7 +74,7 @@
configuration.configure();
}
};
- HibernateSessionSource source = new HibernateSessionSourceImpl(_log, Arrays
+ HibernateSessionSource source = new HibernateSessionSourceImpl(log, Arrays
.asList(configurer));
Configuration config = source.getConfiguration();
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImplTest.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/apache/tapestry/internal/hibernate/HibernateTransactionDecoratorImplTest.java Tue May 6 11:51:27 2008
@@ -30,25 +30,26 @@
@SuppressWarnings({ "ThrowableInstanceNeverThrown" })
public class HibernateTransactionDecoratorImplTest extends TapestryTestCase
{
- private Registry _registry;
+ private Registry registry;
- private AspectDecorator _aspectDecorator;
+ private AspectDecorator aspectDecorator;
@BeforeClass
public void setup()
{
- _registry = IOCUtilities.buildDefaultRegistry();
+ registry = IOCUtilities.buildDefaultRegistry();
- _aspectDecorator = _registry.getService(AspectDecorator.class);
+ aspectDecorator = registry.getService(AspectDecorator.class);
}
@AfterClass
public void shutdown()
{
- _aspectDecorator = null;
- _registry.shutdown();
- _registry = null;
+ registry.shutdown();
+
+ aspectDecorator = null;
+ registry = null;
}
@Test
@@ -203,7 +204,7 @@
private HibernateTransactionDecorator newHibernateSessionManagerDecorator(HibernateSessionManager manager)
{
- return new HibernateTransactionDecoratorImpl(_aspectDecorator, manager);
+ return new HibernateTransactionDecoratorImpl(aspectDecorator, manager);
}
private void assertToString(VoidService interceptor)
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CachedForm.java Tue May 6 11:51:27 2008
@@ -27,35 +27,35 @@
public class CachedForm
{
@Property
- private String _name;
+ private String name;
@Property
- private User _user;
+ private User user;
@Property
- private int _index;
+ private int index;
@Inject
- private Session _session;
+ private Session session;
@Inject
- private HibernateSessionManager _manager;
+ private HibernateSessionManager manager;
void onSuccess()
{
User user = new User();
- user.setFirstName(_name);
+ user.setFirstName(name);
- _session.save(user);
+ session.save(user);
- _manager.commit();
+ manager.commit();
}
@SuppressWarnings("unchecked")
@Cached
public List<User> getUsers()
{
- return _session.createQuery("from User").list();
+ return session.createQuery("from User").list();
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/CommitAfterDemo.java Tue May 6 11:51:27 2008
@@ -10,39 +10,39 @@
*/
public class CommitAfterDemo
{
- private User _user;
+ private User user;
void onActivate(User user)
{
- _user = user;
+ this.user = user;
}
Object onPassivate()
{
- return _user;
+ return user;
}
public User getUser()
{
- return _user;
+ return user;
}
public void setUser(User user)
{
- _user = user;
+ this.user = user;
}
@CommitAfter
void onChangeName()
{
- _user.setFirstName("Frank");
+ user.setFirstName("Frank");
}
@CommitAfter
void doChangeNameWithRuntimeException()
{
- _user.setFirstName("Bill");
+ user.setFirstName("Bill");
throw new RuntimeException("To avoid commit.");
}
@@ -63,7 +63,7 @@
void doChangeNameWithCheckedException() throws SQLException
{
- _user.setFirstName("Troy");
+ user.setFirstName("Troy");
throw new SQLException("Doesn't matter.");
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/EncodeEntities.java Tue May 6 11:51:27 2008
@@ -15,7 +15,7 @@
package org.example.app0.pages;
import org.apache.tapestry.annotations.Property;
-import org.apache.tapestry.hibernate.HibernateSessionManager;
+import org.apache.tapestry.hibernate.annotations.CommitAfter;
import org.apache.tapestry.ioc.annotations.Inject;
import org.example.app0.entities.User;
import org.hibernate.Session;
@@ -25,29 +25,25 @@
public class EncodeEntities
{
@Inject
- private Session _session;
+ private Session session;
@SuppressWarnings("unused")
@Property
- private User _user;
-
- @Inject
- private HibernateSessionManager _manager;
+ private User user;
+ @CommitAfter
void onCreate()
{
User user = new User();
user.setFirstName("name");
- _session.save(user);
-
- _manager.commit();
+ session.save(user);
}
@SuppressWarnings("unchecked")
User onPassivate()
{
- List<User> users = _session.createQuery("from User").list();
+ List<User> users = session.createQuery("from User").list();
if (users.isEmpty())
return null;
@@ -56,6 +52,6 @@
void onActivate(User user)
{
- _user = user;
+ this.user = user;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/PersistEntity.java Tue May 6 11:51:27 2008
@@ -28,13 +28,13 @@
{
@Persist("entity")
@Property
- private User _user;
+ private User user;
@Inject
- private UserDAO _userDAO;
+ private UserDAO userDAO;
@Inject
- private Session _session;
+ private Session session;
@Inject
private HibernateSessionManager _manager;
@@ -44,32 +44,32 @@
User user = new User();
user.setFirstName("name");
- _userDAO.add(user);
+ userDAO.add(user);
- _user = user;
+ this.user = user;
}
void onChangeName()
{
- _user.setFirstName("name2");
+ user.setFirstName("name2");
// No commit, so no real change.
}
void onSetToTransient()
{
- _user = new User();
+ user = new User();
}
void onSetToNull()
{
- _user = null;
+ user = null;
}
void onDelete()
{
- List<User> users = _userDAO.findAll();
+ List<User> users = userDAO.findAll();
- _userDAO.delete(users.toArray(new User[0]));
+ userDAO.delete(users.toArray(new User[0]));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java Tue May 6 11:51:27 2008
@@ -23,10 +23,10 @@
{
@InjectPage
- private CommitAfterDemo _commitAfterDemo;
+ private CommitAfterDemo commitAfterDemo;
@Inject
- private UserDAO _userDAO;
+ private UserDAO userDAO;
Object onActionFromCommitAfter()
{
@@ -34,10 +34,10 @@
user.setFirstName("Diane");
- _userDAO.add(user);
+ userDAO.add(user);
- _commitAfterDemo.setUser(user);
+ commitAfterDemo.setUser(user);
- return _commitAfterDemo;
+ return commitAfterDemo;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/services/UserDAOImpl.java Tue May 6 11:51:27 2008
@@ -21,26 +21,26 @@
public class UserDAOImpl implements UserDAO
{
- private final Session _session;
+ private final Session session;
public UserDAOImpl(Session session)
{
- _session = session;
+ this.session = session;
}
public void add(User user)
{
- _session.save(user);
+ session.save(user);
}
@SuppressWarnings({ "unchecked" })
public List<User> findAll()
{
- return (List<User>) _session.createQuery("from User").list();
+ return (List<User>) session.createQuery("from User").list();
}
public void delete(User... users)
{
- for (User user : users) _session.delete(user);
+ for (User user : users) session.delete(user);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/main/java/org/apache/tapestry/internal/spring/SpringModuleDef.java Tue May 6 11:51:27 2008
@@ -31,34 +31,33 @@
import java.util.Set;
/**
- * A wrapper that converts a Spring {@link ApplicationContext} into a set of service definitions,
- * compatible with Tapestry 5 IoC, for the beans defined in the context, as well as the context
- * itself.
+ * A wrapper that converts a Spring {@link ApplicationContext} into a set of service definitions, compatible with
+ * Tapestry 5 IoC, for the beans defined in the context, as well as the context itself.
*/
public class SpringModuleDef implements ModuleDef
{
private static final String CONTEXT_SERVICE_ID = WebApplicationContext.class.getSimpleName();
- private final ApplicationContext _context;
+ private final ApplicationContext context;
- private final Map<String, ServiceDef> _serviceDefs = newCaseInsensitiveMap();
+ private final Map<String, ServiceDef> serviceDefs = newCaseInsensitiveMap();
public SpringModuleDef(final ApplicationContext context)
{
- _context = context;
+ this.context = context;
- for (final String beanName : BeanFactoryUtils.beanNamesIncludingAncestors(_context))
+ for (final String beanName : BeanFactoryUtils.beanNamesIncludingAncestors(this.context))
{
ServiceDef serviceDef = new ServiceDef()
{
private Object getBean()
{
- return _context.getBean(beanName);
+ return this.context.getBean(beanName);
}
private Class getBeanType()
{
- return _context.getType(beanName);
+ return this.context.getType(beanName);
}
public ObjectCreator createServiceCreator(ServiceBuilderResources resources)
@@ -100,7 +99,7 @@
};
- _serviceDefs.put(beanName, serviceDef);
+ serviceDefs.put(beanName, serviceDef);
}
// And add one service that is the Spring WebApplicationContext.
@@ -114,7 +113,7 @@
{
public Object createObject()
{
- return _context;
+ return this.context;
}
};
}
@@ -147,7 +146,7 @@
};
- _serviceDefs.put(CONTEXT_SERVICE_ID, serviceDef);
+ serviceDefs.put(CONTEXT_SERVICE_ID, serviceDef);
}
public Class getBuilderClass()
@@ -178,12 +177,12 @@
public ServiceDef getServiceDef(String serviceId)
{
- return _serviceDefs.get(serviceId);
+ return serviceDefs.get(serviceId);
}
public Set<String> getServiceIds()
{
- return _serviceDefs.keySet();
+ return serviceDefs.keySet();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/site/apt/index.apt Tue May 6 11:51:27 2008
@@ -73,7 +73,7 @@
+----+
@Inject
- private UserDAO _userDAO;
+ private UserDAO userDAO;
+----+
If you have multiple beans that implement the same interface (for instance, if you have wrapped your bean using a transaction interceptor), you must disambiguate. The easiest way
@@ -85,7 +85,7 @@
+----+
@Inject
@Service("UserDAO")
- private UserDAO _userDAO;
+ private UserDAO userDAO;
+----+
Injection of Spring beans via service builder methods or autobuilding occurs just the same: the Spring beans masquerade as Tapestry IoC services and all is well.
Modified: tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java?rev=653881&r1=653880&r2=653881&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-spring/src/test/java/org/example/testapp/pages/Start.java Tue May 6 11:51:27 2008
@@ -29,14 +29,14 @@
// We're matching on type here, just as we would a service provided in a T5 IoC module.
@Inject
- private Upcase _upcaseBean;
+ private Upcase upcaseBean;
@Inject
- private WebApplicationContext _context;
+ private WebApplicationContext context;
void onSuccess()
{
- _input = _upcaseBean.toUpperCase(_input);
+ _input = upcaseBean.toUpperCase(_input);
}
public String getInput()
@@ -51,7 +51,7 @@
public String getSpringBeans()
{
- return InternalUtils.join(Arrays.asList(_context.getBeanDefinitionNames()));
+ return InternalUtils.join(Arrays.asList(context.getBeanDefinitionNames()));
}
}