You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2006/02/13 11:54:15 UTC
svn commit: r377339 - in /lenya/trunk/src/modules:
jcr/java/src/org/apache/lenya/cms/jcr/
repository/java/test/org/apache/lenya/cms/repo/
Author: andreas
Date: Mon Feb 13 02:54:13 2006
New Revision: 377339
URL: http://svn.apache.org/viewcvs?rev=377339&view=rev
Log:
Added versioning test code, fixed some bugs which popped up
Modified:
lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/AssetProxy.java
lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/TranslationProxy.java
lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/SiteTest.java
lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/VersioningTest.java
Modified: lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/AssetProxy.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/AssetProxy.java?rev=377339&r1=377338&r2=377339&view=diff
==============================================================================
--- lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/AssetProxy.java (original)
+++ lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/AssetProxy.java Mon Feb 13 02:54:13 2006
@@ -60,7 +60,7 @@
TranslationProxy.NODE_NAME,
TranslationProxy.LANGUAGE_PROPERTY,
language);
- proxy.setLabel(label);
+ proxy.setLabelInternal(label);
ResourceProxy resourceProxy = (ResourceProxy) getRepository().addByName(proxy.getAbsolutePath(),
ResourceProxy.NODE_TYPE,
Modified: lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/TranslationProxy.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/TranslationProxy.java?rev=377339&r1=377338&r2=377339&view=diff
==============================================================================
--- lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/TranslationProxy.java (original)
+++ lenya/trunk/src/modules/jcr/java/src/org/apache/lenya/cms/jcr/TranslationProxy.java Mon Feb 13 02:54:13 2006
@@ -37,9 +37,14 @@
protected static final String NODE_TYPE = "lnt:translation";
protected static final String LANGUAGE_PROPERTY = "xml:lang";
protected static final String LABEL_PROPERTY = "lenya:label";
+
+ protected void setLabelInternal(String label) throws RepositoryException {
+ setProperty(LABEL_PROPERTY, label);
+ }
public void setLabel(String label) throws RepositoryException {
- setProperty(LABEL_PROPERTY, label);
+ setLabelInternal(label);
+ save();
}
public String getLanguage() throws RepositoryException {
@@ -112,6 +117,7 @@
public void checkin() throws RepositoryException {
try {
+ save();
getNode().checkin();
} catch (javax.jcr.RepositoryException e) {
throw new RepositoryException(e);
Modified: lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/SiteTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/SiteTest.java?rev=377339&r1=377338&r2=377339&view=diff
==============================================================================
--- lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/SiteTest.java (original)
+++ lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/SiteTest.java Mon Feb 13 02:54:13 2006
@@ -51,6 +51,8 @@
doTestSite(site, asset1);
doTestUrlMapping(child);
+ session.logout();
+ session.getRepository().shutdown();
}
protected void doTestSite(Site site, Asset asset) throws RepositoryException {
Modified: lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/VersioningTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/VersioningTest.java?rev=377339&r1=377338&r2=377339&view=diff
==============================================================================
--- lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/VersioningTest.java (original)
+++ lenya/trunk/src/modules/repository/java/test/org/apache/lenya/cms/repo/VersioningTest.java Mon Feb 13 02:54:13 2006
@@ -20,8 +20,28 @@
public void testVersioning() throws RepositoryException {
Session session = getSession();
+
+ Publication pub = session.addPublication(PUBLICATION_ID);
+ Area area = pub.addArea("authoring");
+
+ AssetType type = session.getRepository().getAssetTypeResolver().resolve(ASSET_TYPYE);
+
+ Asset asset = area.getContent().addAsset(type);
+ Translation trans = asset.addTranslation(LANGUAGE_DE, "hello", "application/xml");
+
+ trans.setLabel("foo");
+ trans.checkin();
-
+ Exception ex = null;
+ try {
+ trans.setLabel("bar");
+ } catch (Exception e) {
+ ex = e;
+ }
+ assertTrue(ex != null && ex instanceof RepositoryException);
+
+ session.logout();
+ session.getRepository().shutdown();
}
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org