Hibernate SVN: r12734 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 17:50:53 -0400 (Sat, 07 Jul 2007)
New Revision: 12734
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-605] docs say @Enumerated(STRING), should be @Enumerated(EnumType.STRING)
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 21:27:29 UTC (rev 12733)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 21:50:53 UTC (rev 12734)
@@ -171,7 +171,7 @@
@Temporal(TemporalType.TIME)
java.util.Date getDepartureTime() { ... } // persistent property
-@Enumerated(STRING)
+(a)Enumerated(EnumType.STRING)
Starred getNote() { ... } //enum persisted as String in database</programlisting>
<para><literal>counter</literal>, a transient field, and
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 21:27:29 UTC (rev 12733)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 21:50:53 UTC (rev 12734)
@@ -175,7 +175,7 @@
@Temporal(TemporalType.TIME)
java.util.Date getDepartureTime() { ... } // propri�t� persistante
-@Enumerated(STRING)
+(a)Enumerated(EnumType.STRING)
Starred getNote() { ... } // enum persist�e en tant que String dans la base de donn�es</programlisting>
<para><literal>counter</literal>, un champ transient, et
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 21:27:29 UTC (rev 12733)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 21:50:53 UTC (rev 12734)
@@ -145,7 +145,7 @@
@Temporal(TemporalType.TIME)
java.util.Date getDepartureTime() { ... } // persistent property
-@Enumerated(STRING)
+(a)Enumerated(EnumType.STRING)
Starred getNote() { ... } //enum persisted as String in database</programlisting>
<para>上面这个例子中,<literal>counter</literal>是一个transient的字段,
18 years, 2 months
Hibernate SVN: r12733 - in trunk/HibernateExt/annotations/doc/reference: fr/modules and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-07 17:27:29 -0400 (Sat, 07 Jul 2007)
New Revision: 12733
Modified:
trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
Log:
[ANN-595] Remove FlushModeType.NEVER
Modified: trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-06 05:03:27 UTC (rev 12732)
+++ trunk/HibernateExt/annotations/doc/reference/en/modules/entity.xml 2007-07-07 21:27:29 UTC (rev 12733)
@@ -3468,7 +3468,7 @@
<itemizedlist>
<listitem>
<para>flushMode: define the query flush mode (Always, Auto, Commit
- or Never)</para>
+ or Manual)</para>
</listitem>
<listitem>
Modified: trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-06 05:03:27 UTC (rev 12732)
+++ trunk/HibernateExt/annotations/doc/reference/fr/modules/entity.xml 2007-07-07 21:27:29 UTC (rev 12733)
@@ -3405,7 +3405,7 @@
<itemizedlist>
<listitem>
<para>flushMode : d�finit le mode de flush de la requ�te (Always,
- Auto, Commit ou Never)</para>
+ Auto, Commit ou Manual)</para>
</listitem>
<listitem>
Modified: trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml
===================================================================
--- trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-06 05:03:27 UTC (rev 12732)
+++ trunk/HibernateExt/annotations/doc/reference/zh_cn/modules/entity.xml 2007-07-07 21:27:29 UTC (rev 12733)
@@ -2813,7 +2813,7 @@
<itemizedlist>
<listitem>
- <para>flushMode: 定义查询的刷新模式(Always, Auto, Commit或Never)</para>
+ <para>flushMode: 定义查询的刷新模式(Always, Auto, Commit或Manual)</para>
</listitem>
<listitem>
18 years, 2 months
Hibernate SVN: r12732 - sandbox/trunk/maven-poc.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-06 01:03:27 -0400 (Fri, 06 Jul 2007)
New Revision: 12732
Removed:
sandbox/trunk/maven-poc/plugins/
Log:
plugin was moved to jboss maven-plugins svn
18 years, 2 months
Hibernate SVN: r12731 - shards/trunk/doc/reference/en/modules.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-07-05 18:01:17 -0400 (Thu, 05 Jul 2007)
New Revision: 12731
Modified:
shards/trunk/doc/reference/en/modules/configuration.xml
Log:
Update docs to reflect usage of new ShardConfiguration interface.
Modified: shards/trunk/doc/reference/en/modules/configuration.xml
===================================================================
--- shards/trunk/doc/reference/en/modules/configuration.xml 2007-07-05 21:51:47 UTC (rev 12730)
+++ shards/trunk/doc/reference/en/modules/configuration.xml 2007-07-05 22:01:17 UTC (rev 12731)
@@ -60,7 +60,7 @@
]]></programlisting>
</sect2>
</sect1>
- <sect1 id="shards-configuration-sf" revision="1">
+ <sect1 id="shards-configuration-sf" revision="2">
<title>Obtaining a ShardedSessionFactory</title>
<para>
Before we show you how to obtain a
@@ -118,10 +118,10 @@
1 public SessionFactory createSessionFactory() {
2 Configuration prototypeConfig = new Configuration().configure("shard0.hibernate.cfg.xml");
3 prototypeConfig.addResource("weather.hbm.xml");
-4 List<Configuration> shardConfigs = new ArrayList<Configuration>();
-5 shardConfigs.add(new Configuration().configure("shard0.hibernate.cfg.xml"));
-6 shardConfigs.add(new Configuration().configure("shard1.hibernate.cfg.xml"));
-7 shardConfigs.add(new Configuration().configure("shard2.hibernate.cfg.xml"));
+4 List<ShardConfiguration> shardConfigs = new ArrayList<ShardConfiguration>();
+5 shardConfigs.add(buildShardConfig("shard0.hibernate.cfg.xml"));
+6 shardConfigs.add(buildShardConfig("shard1.hibernate.cfg.xml"));
+7 shardConfigs.add(buildShardConfig("shard2.hibernate.cfg.xml"));
8 ShardStrategyFactory shardStrategyFactory = buildShardStrategyFactory();
9 ShardedConfiguration shardedConfig = new ShardedConfiguration(
10 prototypeConfig,
@@ -142,6 +142,11 @@
25 };
26 return shardStrategyFactory;
27 }
+28
+29 ShardConfiguration buildShardConfig(String configFile) {
+30 Configuration config = new Configuration().configure(configFile);
+31 return new ConfigurationToShardConfigurationAdapter(config);
+32 }
]]></programlisting>
</para>
<para>
@@ -164,9 +169,14 @@
<listitem>
<para>connection.password</para>
</listitem>
+ <listitem>
+ <para>connection.datasource</para>
+ </listitem>
</itemizedlist>
- The three <classname>Configuration</classname> objects we're loading (lines 5 - 7) will be consulted for the
- shard-specific database url, database user, and database password, and that's all. This means that if you change the
+ The three <classname>ShardConfiguration</classname> objects we're loading (lines 5 - 7) will be consulted for the
+ shard-specific database url, database user, database password, datasource identifier, and that's all. (For a discussion
+ of what these properties are and how they are used, please consult the Hibernate Core documentation.)
+ This means that if you change the
connection pool parameters in shard1.hibernate.cfg.xml, those parameters will be ignored. If you add another
mapping file to the <classname>Configuration</classname>
loaded with the properties defined in shard2.hibernate.cfg.xml, that mapping will be ignored.
@@ -178,9 +188,12 @@
<para>
If you're looking at this code and thinking it seems a bit silly to provide fully-formed configuration
documents that, save a couple special properties, are ignored, rest assured we've looked at this code and
- thought the same thing. We expect the configuration mechanism to evolve over time. We picked this particular
- mechanism because it allowed the greatest reuse of configuration code that was already available in
- Hibernate Core.
+ thought the same thing. That's why the <classname>ShardedConfiguration</classname> constructor takes
+ a <classname>List<ShardConfiguration></classname> as opposed to a
+ <classname>List<Configuration></classname>. <classname>ShardConfiguration</classname>
+ is an interface so you can make the shard-specific configuration data available any way you'd like. In our example
+ we're using an implementation of this interface that wraps a standard <classname>Configuration</classname>
+ (line 31) just to avoid introducing any unfamiliar configuration mechanisms.
</para>
<para>
Once we've built our <classname>Configuration</classname>
18 years, 2 months
Hibernate SVN: r12730 - in shards/trunk/src: java/org/hibernate/shards/session and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-07-05 17:51:47 -0400 (Thu, 05 Jul 2007)
New Revision: 12730
Modified:
shards/trunk/src/java/org/hibernate/shards/id/ShardedUUIDGenerator.java
shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java
shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java
Log:
Clean up a few warnings
Modified: shards/trunk/src/java/org/hibernate/shards/id/ShardedUUIDGenerator.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/id/ShardedUUIDGenerator.java 2007-07-05 21:50:54 UTC (rev 12729)
+++ shards/trunk/src/java/org/hibernate/shards/id/ShardedUUIDGenerator.java 2007-07-05 21:51:47 UTC (rev 12730)
@@ -18,13 +18,12 @@
package org.hibernate.shards.id;
-import org.hibernate.shards.ShardId;
-import org.hibernate.shards.util.Preconditions;
-import org.hibernate.shards.session.ShardedSessionImpl;
-
import org.hibernate.dialect.Dialect;
import org.hibernate.engine.SessionImplementor;
import org.hibernate.id.UUIDHexGenerator;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.session.ShardedSessionImpl;
+import org.hibernate.shards.util.Preconditions;
import org.hibernate.type.Type;
import org.hibernate.util.PropertiesHelper;
@@ -41,7 +40,6 @@
public class ShardedUUIDGenerator extends UUIDHexGenerator implements ShardEncodingIdentifierGenerator {
private IdType idType;
- private int shardId;
private static String ZERO_STRING = "00000000000000000000000000000000";
private static String ID_TYPE_PROPERTY = "sharded-uuid-type";
Modified: shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-07-05 21:50:54 UTC (rev 12729)
+++ shards/trunk/src/java/org/hibernate/shards/session/ShardedSessionImpl.java 2007-07-05 21:51:47 UTC (rev 12730)
@@ -20,33 +20,66 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.Interceptor;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.ReplicationMode;
+import org.hibernate.SQLQuery;
+import org.hibernate.SessionException;
+import org.hibernate.Transaction;
+import org.hibernate.TransientObjectException;
+import org.hibernate.UnresolvableObjectException;
import org.hibernate.classic.Session;
import org.hibernate.engine.SessionFactoryImplementor;
import org.hibernate.id.IdentifierGenerator;
import org.hibernate.metadata.ClassMetadata;
import org.hibernate.proxy.HibernateProxy;
-import org.hibernate.shards.*;
+import org.hibernate.shards.CrossShardAssociationException;
+import org.hibernate.shards.Shard;
+import org.hibernate.shards.ShardId;
+import org.hibernate.shards.ShardImpl;
+import org.hibernate.shards.ShardOperation;
+import org.hibernate.shards.ShardedTransaction;
import org.hibernate.shards.criteria.CriteriaFactoryImpl;
import org.hibernate.shards.criteria.CriteriaId;
import org.hibernate.shards.criteria.ShardedCriteriaImpl;
import org.hibernate.shards.engine.ShardedSessionFactoryImplementor;
import org.hibernate.shards.engine.ShardedSessionImplementor;
import org.hibernate.shards.id.ShardEncodingIdentifierGenerator;
-import org.hibernate.shards.query.*;
+import org.hibernate.shards.query.AdHocQueryFactoryImpl;
+import org.hibernate.shards.query.ExitOperationsQueryCollector;
+import org.hibernate.shards.query.NamedQueryFactoryImpl;
+import org.hibernate.shards.query.QueryId;
+import org.hibernate.shards.query.ShardedQueryImpl;
import org.hibernate.shards.stat.ShardedSessionStatistics;
import org.hibernate.shards.strategy.ShardStrategy;
import org.hibernate.shards.strategy.exit.FirstNonNullResultExitStrategy;
import org.hibernate.shards.strategy.selection.ShardResolutionStrategyData;
import org.hibernate.shards.strategy.selection.ShardResolutionStrategyDataImpl;
import org.hibernate.shards.transaction.ShardedTransactionImpl;
-import org.hibernate.shards.util.*;
+import org.hibernate.shards.util.Iterables;
+import org.hibernate.shards.util.Lists;
+import org.hibernate.shards.util.Maps;
+import org.hibernate.shards.util.Pair;
+import org.hibernate.shards.util.Preconditions;
+import org.hibernate.shards.util.Sets;
import org.hibernate.stat.SessionStatistics;
import org.hibernate.type.Type;
import java.io.Serializable;
import java.sql.Connection;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* Concrete implementation of a ShardedSession, and also the central component of
@@ -374,8 +407,7 @@
}
/**
- * We do not have sharded Connections as that would mean pushing sharding to
- * connection-level.
+ * @deprecated
*/
public Connection connection() throws HibernateException {
throw new UnsupportedOperationException();
Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java 2007-07-05 21:50:54 UTC (rev 12729)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/SessionDefaultMock.java 2007-07-05 21:51:47 UTC (rev 12730)
@@ -18,7 +18,18 @@
package org.hibernate.shards.defaultmock;
-import org.hibernate.*;
+import org.hibernate.CacheMode;
+import org.hibernate.Criteria;
+import org.hibernate.EntityMode;
+import org.hibernate.Filter;
+import org.hibernate.FlushMode;
+import org.hibernate.HibernateException;
+import org.hibernate.LockMode;
+import org.hibernate.Query;
+import org.hibernate.ReplicationMode;
+import org.hibernate.SQLQuery;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
import org.hibernate.classic.Session;
import org.hibernate.stat.SessionStatistics;
import org.hibernate.type.Type;
@@ -34,105 +45,171 @@
*/
public class SessionDefaultMock implements Session {
+ /**
+ * @deprecated
+ */
public Object saveOrUpdateCopy(Object object) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Object saveOrUpdateCopy(Object object, Serializable id)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Object saveOrUpdateCopy(String entityName, Object object)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Object saveOrUpdateCopy(String entityName, Object object,
Serializable id) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public List find(String query) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public List find(String query, Object value, Type type)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public List find(String query, Object[] values, Type[] types)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Iterator iterate(String query) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Iterator iterate(String query, Object value, Type type)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Iterator iterate(String query, Object[] values, Type[] types)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Collection filter(Object collection, String filter)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Collection filter(Object collection, String filter, Object value,
Type type) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Collection filter(Object collection, String filter, Object[] values,
Type[] types) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public int delete(String query) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public int delete(String query, Object value, Type type)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public int delete(String query, Object[] values, Type[] types)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Query createSQLQuery(String sql, String returnAlias,
Class returnClass) {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Query createSQLQuery(String sql, String[] returnAliases,
Class[] returnClasses) {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public void save(Object object, Serializable id) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public void save(String entityName, Object object, Serializable id)
throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public void update(Object object, Serializable id) throws HibernateException {
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public void update(String entityName, Object object, Serializable id)
throws HibernateException {
throw new UnsupportedOperationException();
@@ -170,6 +247,9 @@
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public Connection connection() throws HibernateException {
throw new UnsupportedOperationException();
}
@@ -408,6 +488,9 @@
throw new UnsupportedOperationException();
}
+ /**
+ * @deprecated
+ */
public void reconnect() throws HibernateException {
throw new UnsupportedOperationException();
}
Modified: shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java 2007-07-05 21:50:54 UTC (rev 12729)
+++ shards/trunk/src/test/org/hibernate/shards/integration/BaseShardingIntegrationTestCase.java 2007-07-05 21:51:47 UTC (rev 12730)
@@ -19,6 +19,7 @@
package org.hibernate.shards.integration;
import junit.framework.TestCase;
+
import org.hibernate.Session;
import org.hibernate.cfg.Configuration;
import org.hibernate.shards.ShardId;
@@ -53,7 +54,11 @@
import java.sql.SQLException;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
/**
* Base class for all sharding integration tests.
@@ -132,12 +137,20 @@
DatabasePlatform dbPlatform = DatabasePlatformFactory.FACTORY.getDatabasePlatform();
String dbPlatformConfigDirectory = "platform/" + dbPlatform.getName().toLowerCase() +"/config/";
IdGenType idGenType = getIdGenType();
- Configuration config = new Configuration();
+ Configuration config = createPrototypeConfiguration();
config.configure(BaseShardingIntegrationTestCase.class.getResource(dbPlatformConfigDirectory + "shard0.hibernate.cfg.xml"));
config.addURL(BaseShardingIntegrationTestCase.class.getResource(dbPlatformConfigDirectory + idGenType.getMappingFile()));
return config;
}
+ /**
+ * You can override this if you want to return your own subclass of Configuration.
+ * @return The {@link Configuration} to use as the prototype
+ */
+ protected Configuration createPrototypeConfiguration() {
+ return new Configuration();
+ }
+
protected List<ShardConfiguration> buildConfigurations() {
DatabasePlatform dbPlatform = DatabasePlatformFactory.FACTORY.getDatabasePlatform();
String dbPlatformConfigDirectory = "platform/" + dbPlatform.getName().toLowerCase() +"/config/";
@@ -238,7 +251,7 @@
/**
* Override if you want additional tables in your schema
*/
- protected void createDatabaseHook(Connection conn) {
+ protected void createDatabaseHook(Connection conn) throws SQLException {
}
/**
18 years, 2 months
Hibernate SVN: r12729 - in shards/trunk/src: java/org/hibernate/shards/cfg and 2 other directories.
by hibernate-commits＠lists.jboss.org
Author: max.ross
Date: 2007-07-05 17:50:54 -0400 (Thu, 05 Jul 2007)
New Revision: 12729
Modified:
shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java
shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java
shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java
shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java
Log:
Fix HSHARDS-37
Users can now specify a datasource instead of a username/password/url.
Modified: shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java 2007-07-05 01:37:10 UTC (rev 12728)
+++ shards/trunk/src/java/org/hibernate/shards/ShardedConfiguration.java 2007-07-05 21:50:54 UTC (rev 12729)
@@ -225,14 +225,25 @@
* in the prototype config.
*/
void populatePrototypeWithVariableProperties(ShardConfiguration config) {
- prototypeConfiguration.setProperty(Environment.USER, config.getShardUser());
- prototypeConfiguration.setProperty(Environment.PASS, config.getShardPassword());
- prototypeConfiguration.setProperty(Environment.URL, config.getShardUrl());
- prototypeConfiguration.setProperty(Environment.SESSION_FACTORY_NAME, config.getShardSessionFactoryName());
- prototypeConfiguration.setProperty(ShardedEnvironment.SHARD_ID_PROPERTY, config.getShardId().toString());
+ safeSet(prototypeConfiguration, Environment.USER, config.getShardUser());
+ safeSet(prototypeConfiguration, Environment.PASS, config.getShardPassword());
+ safeSet(prototypeConfiguration, Environment.URL, config.getShardUrl());
+ safeSet(prototypeConfiguration, Environment.DATASOURCE, config.getShardDatasource());
+ safeSet(prototypeConfiguration, Environment.SESSION_FACTORY_NAME, config.getShardSessionFactoryName());
+ safeSet(prototypeConfiguration, ShardedEnvironment.SHARD_ID_PROPERTY, config.getShardId().toString());
}
/**
+ * Set the key to the given value on the given config, but only if the
+ * value is not null.
+ */
+ static void safeSet(Configuration config, String key, String value) {
+ if(value != null) {
+ config.setProperty(key, value);
+ }
+ }
+
+ /**
* Helper function that creates an actual SessionFactory.
*/
private SessionFactoryImplementor buildSessionFactory() {
Modified: shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java 2007-07-05 01:37:10 UTC (rev 12728)
+++ shards/trunk/src/java/org/hibernate/shards/cfg/ConfigurationToShardConfigurationAdapter.java 2007-07-05 21:50:54 UTC (rev 12729)
@@ -51,5 +51,9 @@
public Integer getShardId() {
return Integer.parseInt(config.getProperty(ShardedEnvironment.SHARD_ID_PROPERTY));
- }
+ }
+
+ public String getShardDatasource() {
+ return config.getProperty(Environment.DATASOURCE);
+ }
}
Modified: shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java
===================================================================
--- shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java 2007-07-05 01:37:10 UTC (rev 12728)
+++ shards/trunk/src/java/org/hibernate/shards/cfg/ShardConfiguration.java 2007-07-05 21:50:54 UTC (rev 12729)
@@ -26,16 +26,19 @@
public interface ShardConfiguration {
/**
- * @return the url of the shard
+ * @see org.hibernate.cfg.Environment#URL
+ * @return the url of the shard.
*/
String getShardUrl();
/**
+ * @see org.hibernate.cfg.Environment#USER
* @return the user that will be sent to the shard for authentication
*/
String getShardUser();
/**
+ * @see org.hibernate.cfg.Environment#PASS
* @return the password that will be sent to the shard for authentication
*/
String getShardPassword();
@@ -50,4 +53,10 @@
* @return unique id of the shard
*/
Integer getShardId();
+
+ /**
+ * @see org.hibernate.cfg.Environment#DATASOURCE
+ * @return the datasource for the shard
+ */
+ String getShardDatasource();
}
Modified: shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java 2007-07-05 01:37:10 UTC (rev 12728)
+++ shards/trunk/src/test/org/hibernate/shards/ShardedConfigurationTest.java 2007-07-05 21:50:54 UTC (rev 12729)
@@ -162,5 +162,9 @@
public Integer getShardId() {
return shardId;
}
+
+ public String getShardDatasource() {
+ return null;
+ }
}
}
Modified: shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java
===================================================================
--- shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java 2007-07-05 01:37:10 UTC (rev 12728)
+++ shards/trunk/src/test/org/hibernate/shards/defaultmock/ShardConfigurationDefaultMock.java 2007-07-05 21:50:54 UTC (rev 12729)
@@ -43,5 +43,9 @@
public Integer getShardId() {
throw new UnsupportedOperationException();
}
+
+ public String getShardDatasource() {
+ throw new UnsupportedOperationException();
+ }
}
18 years, 2 months
Hibernate SVN: r12728 - core/branches/Branch_3_2.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2007-07-04 21:37:10 -0400 (Wed, 04 Jul 2007)
New Revision: 12728
Modified:
core/branches/Branch_3_2/
Log:
added svn:ignore values
Property changes on: core/branches/Branch_3_2
___________________________________________________________________
Name: svn:ignore
+ target
local
*.ipr
*.iws
*.iml
.classpath
.project
.nbattrs
*.log
*.properties
.clover
18 years, 2 months
Hibernate SVN: r12727 - in core/trunk/documentation/manual: es-ES/src/main/docbook/modules and 5 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-04 02:18:11 -0400 (Wed, 04 Jul 2007)
New Revision: 12727
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_criteria.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_criteria.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_criteria.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_criteria.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_criteria.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_criteria.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_criteria.xml
Log:
[HHH-1561] Missing " in Documentation for H3, Chapter 15.8
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -356,7 +356,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -373,7 +373,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -351,7 +351,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -368,7 +368,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -362,7 +362,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -379,7 +379,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -364,7 +364,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -381,7 +381,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -342,7 +342,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -359,7 +359,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -356,7 +356,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -373,7 +373,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_criteria.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:14:36 UTC (rev 12726)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/query_criteria.xml 2007-07-04 06:18:11 UTC (rev 12727)
@@ -347,7 +347,7 @@
<programlisting><![CDATA[DetachedCriteria avgWeight = DetachedCriteria.forClass(Cat.class)
.setProjection( Property.forName("weight").avg() );
session.createCriteria(Cat.class)
- .add( Property.forName("weight).gt(avgWeight) )
+ .add( Property.forName("weight").gt(avgWeight) )
.list();]]></programlisting>
<programlisting><![CDATA[DetachedCriteria weights = DetachedCriteria.forClass(Cat.class)
@@ -364,7 +364,7 @@
.setProjection( Property.forName("weight").avg() )
.add( Property.forName("cat2.sex").eqProperty("cat.sex") );
session.createCriteria(Cat.class, "cat")
- .add( Property.forName("weight).gt(avgWeightForSex) )
+ .add( Property.forName("weight").gt(avgWeightForSex) )
.list();]]></programlisting>
</sect1>
18 years, 2 months
Hibernate SVN: r12726 - in core/trunk/documentation/manual: es-ES/src/main/docbook/modules and 5 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-04 02:14:36 -0400 (Wed, 04 Jul 2007)
New Revision: 12726
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/basic_mapping.xml
core/trunk/documentation/manual/es-ES/src/main/docbook/modules/basic_mapping.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/basic_mapping.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/basic_mapping.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/basic_mapping.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/basic_mapping.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/basic_mapping.xml
Log:
[HHH-2180] minordocumentation error in hbm xml
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -2052,7 +2052,7 @@
<literal>Person</literal> mapping:
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/es-ES/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/es-ES/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/es-ES/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -1751,7 +1751,7 @@
<literal>Person</literal> :
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -1707,7 +1707,7 @@
<para>
Et cette association peut �tre rendue bidirectionnelle en ajoutant ceci au mapping de <literal>Person</literal> :
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
<sect2 id="mapping-declaration-naturalid">
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -1916,7 +1916,7 @@
�ȉ��̋L�q�� <literal>Person</literal> �̃}�b�s���O�ɒlj����邱�Ƃőo�����ɂ��邱�Ƃ��ł��܂��F
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -1776,7 +1776,7 @@
그리고 이 연관은 다음을 <literal>Person</literal> 매핑에 추가함으로써 양방향이 될 수 있다:
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -1947,7 +1947,7 @@
no mapeamento de <literal>Person</literal>:
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/basic_mapping.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:12:25 UTC (rev 12725)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/basic_mapping.xml 2007-07-04 06:14:36 UTC (rev 12726)
@@ -1742,7 +1742,7 @@
如果在<literal>Person</literal>的映射加入下面几句，这种关联就是双向的：
</para>
- <programlisting><![CDATA[<one-to-one name"employee" class="Employee" property-ref="person"/>]]></programlisting>
+ <programlisting><![CDATA[<one-to-one name="employee" class="Employee" property-ref="person"/>]]></programlisting>
</sect2>
18 years, 2 months
Hibernate SVN: r12725 - in core/trunk/documentation/manual: fr-FR/src/main/docbook/modules and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: d.plentz
Date: 2007-07-04 02:12:25 -0400 (Wed, 04 Jul 2007)
New Revision: 12725
Modified:
core/trunk/documentation/manual/en-US/src/main/docbook/modules/toolset_guide.xml
core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/toolset_guide.xml
core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/toolset_guide.xml
core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/toolset_guide.xml
core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/toolset_guide.xml
core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/toolset_guide.xml
Log:
[HHH-2267] A copy/paste mistake in the documentation for <schemavalidator> ant task
Modified: core/trunk/documentation/manual/en-US/src/main/docbook/modules/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/en-US/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:05:53 UTC (rev 12724)
+++ core/trunk/documentation/manual/en-US/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:12:25 UTC (rev 12725)
@@ -593,7 +593,7 @@
<fileset dir="src">
<include name="**/*.hbm.xml"/>
</fileset>
- </schemaupdate>
+ </schemavalidator>
</target>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:05:53 UTC (rev 12724)
+++ core/trunk/documentation/manual/fr-FR/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:12:25 UTC (rev 12725)
@@ -584,7 +584,7 @@
<fileset dir="src">
<include name="**/*.hbm.xml"/>
</fileset>
- </schemaupdate>
+ </schemavalidator>
</target>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:05:53 UTC (rev 12724)
+++ core/trunk/documentation/manual/ja-JP/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:12:25 UTC (rev 12725)
@@ -623,7 +623,7 @@
<fileset dir="src">
<include name="**/*.hbm.xml"/>
</fileset>
- </schemaupdate>
+ </schemavalidator>
</target>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:05:53 UTC (rev 12724)
+++ core/trunk/documentation/manual/ko-KR/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:12:25 UTC (rev 12725)
@@ -577,7 +577,7 @@
<fileset dir="src">
<include name="**/*.hbm.xml"/>
</fileset>
- </schemaupdate>
+ </schemavalidator>
</target>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:05:53 UTC (rev 12724)
+++ core/trunk/documentation/manual/pt-BR/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:12:25 UTC (rev 12725)
@@ -593,7 +593,7 @@
<fileset dir="src">
<include name="**/*.hbm.xml"/>
</fileset>
- </schemaupdate>
+ </schemavalidator>
</target>]]></programlisting>
</sect2>
Modified: core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/toolset_guide.xml
===================================================================
--- core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:05:53 UTC (rev 12724)
+++ core/trunk/documentation/manual/zh-CN/src/main/docbook/modules/toolset_guide.xml 2007-07-04 06:12:25 UTC (rev 12725)
@@ -554,7 +554,7 @@
<fileset dir="src">
<include name="**/*.hbm.xml"/>
</fileset>
- </schemaupdate>
+ </schemavalidator>
</target>]]></programlisting>
</sect2>
18 years, 2 months