You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/08/17 09:28:53 UTC
svn commit: r986220 - in
/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent: ./
org.apache.clerezza.app.webguiexamples/
org.apache.clerezza.integrationtest.web.performance/
org.apache.clerezza.platform.accountcontrolpanel/org.apache.cle...
Author: reto
Date: Tue Aug 17 07:28:52 2010
New Revision: 986220
URL: http://svn.apache.org/viewvc?rev=986220&view=rev
Log:
CLEREZZA-270: merged down trunk
Added:
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/resources/org/apache/clerezza/utils/imagemagick/rocket.jpg
- copied unchanged from r986214, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/resources/org/apache/clerezza/utils/imagemagick/rocket.jpg
Modified:
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.integrationtest.web.performance/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/settings-panel.ssp
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.config/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.content/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.language/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.security/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.basic/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.typehandlerspace/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.scala.utils/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/pom.xml
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imageprocessing/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/ (props changed)
incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/pom.xml
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -0,0 +1 @@
+/incubator/clerezza/trunk/org.apache.clerezza.parent:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.app.webguiexamples:892743-917524
/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.app.webguiexamples:894321-894392
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.app.webguiexamples:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.integrationtest.web.performance/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-27/org.apache.clerezza.integrationtest.web.performance:890501-897828
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.integrationtest.web.performance:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/java/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.java Tue Aug 17 07:28:52 2010
@@ -71,6 +71,7 @@ import org.apache.clerezza.jaxrs.utils.f
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
import org.apache.clerezza.platform.accountcontrolpanel.ontologies.CONTROLPANEL;
import org.apache.clerezza.platform.config.SystemConfig;
+import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.platform.typerendering.RenderletManager;
import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;
import org.apache.clerezza.rdf.core.BNode;
@@ -113,6 +114,8 @@ public class SettingsPanel {
private MGraph systemGraph; // System graph for user data access
@Reference
private RenderletManager renderletManager;
+ @Reference
+ private ContentGraphProvider cgProvider;
private final Logger logger = LoggerFactory.getLogger(SettingsPanel.class);
private ConfigurationAdmin configAdmin;
@@ -525,6 +528,33 @@ public class SettingsPanel {
/**
* changes the password of an user
+ *
+ * @param idP id is the username as given in the URL
+ * @param lang represents the user's new standard language.
+ * @return
+ */
+ @POST
+ @Path("change-language")
+ public Response changeUserLanguage(@PathParam(value = "id") String idP,
+ @FormParam("availablelanguages") final String lang, @Context UriInfo uriInfo) {
+
+ final String id = idP;
+ AccessController.checkPermission(new AccountControlPanelAppPermission(id, ""));
+ AccessController.doPrivileged(new PrivilegedAction() {
+ @Override
+ public Object run() {
+ GraphNode userNode = new GraphNode(getAgent(id), systemGraph);
+ userNode.deleteProperties(PLATFORM.preferredLangInISOCode);
+ userNode.addProperty(PLATFORM.preferredLangInISOCode, LiteralFactory.getInstance().createTypedLiteral(lang));
+ return null;
+ }
+ });
+
+ return RedirectUtil.createSeeOtherResponse("../control-panel", uriInfo);
+ }
+
+ /**
+ * changes the password of an user
*
* @param idP id is the username as given in the URL
* @param oldPW the current user password
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/settings-panel.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/settings-panel.ssp?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/settings-panel.ssp (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.accountcontrolpanel/org.apache.clerezza.platform.accountcontrolpanel.core/src/main/resources/org/apache/clerezza/platform/accountcontrolpanel/settings-panel.ssp Tue Aug 17 07:28:52 2010
@@ -14,10 +14,10 @@ if ((res/cp("userBundlePermission")*) ==
<h3>Install Bundle</h3>
<form method="post" action="control-panel/install-bundle" enctype="multipart/form-data">
- <input type="file" class="FieldText" name="bundle" size="30" title="bundle path"/>
- <input value="Install" type="submit"/><p />
+ <input type="file" class="FieldText" name="bundle" size="30" title="bundle path"/><br/><br/>
+ <input style="width: 5em;" value="Install" type="submit"/><p />
</form>
-
+ <br/><br/>
<h3>User Bundles</h3>
<table border="1">
<tbody>
@@ -68,29 +68,60 @@ if ((res/cp("userBundlePermission")*) ==
if((res/cp("changePasswordPermission")*) == "true") {
nodeBuff +=(<h2>Change Password</h2>
- <form method="post" action="control-panel/change-password" >
- <label for="oldPW">Current Password:</label>
- <input type="password" name="oldPW"/>
- <br />
- <label for="newPW">New Password:</label>
- <input type="password" name="newPW"/>
- <br />
- <label for="confirmNewPW">Confirm new Password:</label>
- <input type="password" name="confirmNewPW"/>
- <br />
- <input type="submit" name="submit" value="Submit"/>
+
+
+ <form action="control-panel/change-password" method="post">
+ <fieldset>
+ <ol style="display: block;">
+ <li class="tx-line" style="background-image: none;">
+ <label>Current Password:</label>
+ <span class="tx-item">
+ <input type="password" name="oldPW"/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none;">
+ <label>New Password:</label>
+ <span class="tx-item">
+ <input type="password" name="newPW"/>
+ </span>
+ </li>
+ <li class="tx-line" style="background-image: none;">
+ <label>Confirm new Password:</label>
+ <span class="tx-item">
+ <input type="password" name="confirmNewPW"/>
+ </span>
+ </li>
+ <br />
+ <input style="width: 5em;" type="submit" name="submit" value="Submit"/>
+ </ol>
+ <br/>
+ </fieldset>
</form>)
+
+
}
if((res/cp("changedPassword")).length > 0) {
nodeBuff +=(<br /><span>Password has not changed, either wrong current password or the
- new password and the confirmation didn't match!</span>)
+ new password and the confirmation didn't match!<br /><br /></span>)
}
+
+nodeBuff +=(<h2>Change user's default language</h2>
+ <form method="post" action="control-panel/change-language">
+ {render(context/platform("instance")/platform("languages"), "naked")}
+ <br/><br/>
+ <script type="text/javascript">$("#availablelanguages").val({"'" + (context/platform("user")/platform("preferredLangInISOCode")*) + "'"})</script>
+ <input style="width: 5em;" type="submit" name="submit" value="Submit"/>
+ <br/><br/>
+ </form>)
+
<div id="tx-content">
-{if(nodeBuff.isEmpty)
- <span>There are no settings you can configure for this account!</span>
-else
- nodeBuff
-}
+ <div class="tx-edit" style="margin-left: 0.5em;">
+ {if(nodeBuff.isEmpty)
+ <span>There are no settings you can configure for this account!</span>
+ else
+ nodeBuff
+ }
+ </div>
</div>
\ No newline at end of file
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptProviderManagerTest.java Tue Aug 17 07:28:52 2010
@@ -25,6 +25,8 @@ import org.apache.clerezza.platform.conc
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.rdf.core.access.LockableMGraphWrapper;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.junit.Assert;
import org.junit.Before;
@@ -53,7 +55,7 @@ public class ConceptProviderManagerTest
}
}
- private static MGraph mGraph = new SimpleMGraph();
+ private static LockableMGraph mGraph = new LockableMGraphWrapper(new SimpleMGraph());
private TestedConceptProviderManager testedConceptProviderManager;
@@ -63,7 +65,7 @@ public class ConceptProviderManagerTest
testedConceptProviderManager.cgProvider = new ContentGraphProvider() {
@Override
- public MGraph getContentGraph() {
+ public LockableMGraph getContentGraph() {
return mGraph;
}
};
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/test/java/org/apache/clerezza/platform/concepts/core/ConceptsFinderTest.java Tue Aug 17 07:28:52 2010
@@ -26,6 +26,8 @@ import org.apache.clerezza.platform.grap
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.rdf.core.access.LockableMGraphWrapper;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.OWL;
@@ -94,7 +96,7 @@ public class ConceptsFinderTest {
private class TestedConceptsFinder extends ConceptsFinder {
}
- private static MGraph mGraph = new SimpleMGraph();
+ private static LockableMGraph mGraph = new LockableMGraphWrapper(new SimpleMGraph());
private TestedConceptProviderManager testedConceptProviderManager;
private TestedConceptsFinder testedConceptsFinder;
@@ -111,8 +113,8 @@ public class ConceptsFinderTest {
final ContentGraphProvider cgProvider = new ContentGraphProvider() {
@Override
- public MGraph getContentGraph() {
- return new SimpleMGraph();
+ public LockableMGraph getContentGraph() {
+ return new LockableMGraphWrapper(new SimpleMGraph());
}
};
@@ -120,7 +122,7 @@ public class ConceptsFinderTest {
testedConceptProviderManager = new TestedConceptProviderManager();
testedConceptProviderManager.cgProvider = new ContentGraphProvider() {
@Override
- public MGraph getContentGraph() {
+ public LockableMGraph getContentGraph() {
return mGraph;
}
};
@@ -149,4 +151,4 @@ public class ConceptsFinderTest {
Assert.assertFalse(proposals.hasProperty(QUERYRESULT.concept, concept2c));
Assert.assertFalse(proposals.hasProperty(QUERYRESULT.concept, concept2d));
}
-}
\ No newline at end of file
+}
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-113/org.apache.clerezza.platform.config:908544-910847
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.content/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -6,3 +6,4 @@
/incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content:891178-892849
/incubator/clerezza/issues/CLEREZZA-65/org.apache.clerezza.platform.content:897875-897920
/incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.platform.content:897917-903631
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.content:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.graphprovider.content/src/main/java/org/apache/clerezza/platform/graphprovider/content/ContentGraphProvider.java Tue Aug 17 07:28:52 2010
@@ -19,7 +19,6 @@
package org.apache.clerezza.platform.graphprovider.content;
import java.util.Arrays;
-import java.util.Dictionary;
import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -29,6 +28,7 @@ import org.osgi.service.component.Compon
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.utils.UnionMGraph;
@@ -91,7 +91,7 @@ public class ContentGraphProvider {
}
}
- public MGraph getContentGraph() {
+ public LockableMGraph getContentGraph() {
configLock.readLock().lock();
try {
TripleCollection[] united = new TripleCollection[additions.length + 1];
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.language/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-113/org.apache.clerezza.platform.language:908544-911024
/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.platform.language:898371-901144
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.language:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-128/org.apache.clerezza.platform.launcher.storageless.parent:912531-915732
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/src/main/java/org/apache/clerezza/platform/launcher/Main.java Tue Aug 17 07:28:52 2010
@@ -287,7 +287,7 @@ public class Main implements BundleActiv
}
{
- final String keyStorePassword = arguments.getKeyStorePath();
+ final String keyStorePassword = arguments.getKeyStorePassword();
if (keyStorePassword != null) {
configProps.put("org.wymiwyg.jetty.httpservice.https.keystore.password", keyStorePassword);
httpsEnabled = true;
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-80/org.apache.clerezza.platform.scripting:900994-901238
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.platform.scripting.scriptmanager:894321-894392
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.scripting.scriptmanager:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.security/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-80/org.apache.clerezza.platform.security:900994-901238
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.basic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-80/org.apache.clerezza.platform.security.auth.basic:900994-901238
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.basic:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-80/org.apache.clerezza.platform.security.auth.cookie:900994-901238
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/pom.xml Tue Aug 17 07:28:52 2010
@@ -25,24 +25,24 @@
<groupId>org.apache.clerezza.ext</groupId>
<artifactId>com.hp.hpl.jena</artifactId>
</dependency>
- <dependency>
+ <!-- <dependency>
<groupId>org.apache.felix</groupId>
<version>1.0.0</version>
<artifactId>org.apache.felix.log</artifactId>
<scope>provided</scope>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId>
<scope>provided</scope>
- <version>1.4</version>
+ <version>1.5.2</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId>
<scope>provided</scope>
- <version>1.4</version>
- <exclusions>
+ <version>1.5.2</version>
+ <!-- <exclusions>
<exclusion>
<artifactId>jmxri</artifactId>
<groupId>com.sun.jmx</groupId>
@@ -51,7 +51,7 @@
<artifactId>jmxtools</artifactId>
<groupId>com.sun.jdmk</groupId>
</exclusion>
- </exclusions>
+ </exclusions> -->
</dependency>
<dependency>
<groupId>org.apache.clerezza.ext</groupId>
@@ -112,6 +112,11 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.permissiondescriptions</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.utils</artifactId>
<scope>provided</scope>
</dependency>
@@ -162,6 +167,16 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.utils</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.content</artifactId>
<scope>provided</scope>
</dependency>
@@ -330,19 +345,16 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>1.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -356,18 +368,15 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit-extender-impl</artifactId>
- <version>1.2.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit-extender</artifactId>
- <version>1.2.0</version>
</dependency>
</dependencies>
<build>
@@ -385,21 +394,6 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.0</version>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-config</id>
- <goals>
- <goal>generate-config</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java Tue Aug 17 07:28:52 2010
@@ -61,8 +61,8 @@ public class FelixClerezzaPlatformTest {
"org.osgi.compendium").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.ext").artifactId(
"com.hp.hpl.jena").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix").artifactId(
- "org.apache.felix.log").versionAsInProject(),
+ /*mavenBundle().groupId("org.apache.felix").artifactId(
+ "org.apache.felix.log").versionAsInProject(),*/
mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
"pax-logging-api").versionAsInProject(),
mavenBundle().groupId("org.ops4j.pax.logging").artifactId(
@@ -102,14 +102,22 @@ public class FelixClerezzaPlatformTest {
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.rdf.ontologies").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+ "org.apache.clerezza.platform").versionAsInProject(),
+ mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.config").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.graphprovider.content").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.templating").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
+ "scala-compiler-osgi").versionAsInProject(),
+ mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
+ "scala-library-osgi").versionAsInProject(),
+ mavenBundle().groupId("org.apache.clerezza.scala").artifactId(
"script-engine").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+ "org.apache.clerezza.permissiondescriptions").versionAsInProject(),
+ mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.typerendering.scalaserverpages").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.rdf.scala.utils").versionAsInProject(),
@@ -162,13 +170,18 @@ public class FelixClerezzaPlatformTest {
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.web.resources.yui").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
+ "org.apache.clerezza.permissiondescriptions").versionAsInProject(),
+ mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.utils.imageprocessing").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.language.core").versionAsInProject(),
+ mavenBundle().groupId("org.apache.httpcomponents").artifactId(
+ "httpcore-osgi").versionAsInProject(),
//dsProfile(),
configProfile(),
webProfile(),
junitBundles(),
+ vmOption("-XX:MaxPermSize=200m"),
frameworks(
felix()),
systemProperty("org.osgi.service.http.port").value(
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.typehandlerspace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-91/org.apache.clerezza.platform.typehandlerspace:905991-906055
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typehandlerspace:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,3 +1,4 @@
/incubator/clerezza/issues/CLEREZZA-128/org.apache.clerezza.platform.typerendering:910457-915732
/incubator/clerezza/issues/CLEREZZA-34:890804-891129
/incubator/clerezza/issues/CLEREZZA-34/org.apache.clerezza.platform.typerendering:890796-891226
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-128/org.apache.clerezza.platform.typerendering.scalaserverpages:910457-915732
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-107/org.apache.clerezza.platform.usermanager:908104-911404
/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.platform.usermanager:905960-908526
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-39/org.apache.clerezza.platform.xhtml2html:895979-897874
/incubator/clerezza/issues/CLEREZZA-69/org.apache.clerezza.platform.xhtml2html:898291-907977
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.xhtml2html:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -3,3 +3,4 @@
/incubator/clerezza/issues/CLEREZZA-33/org.apache.clerezza.rdf.core:890770-890809
/incubator/clerezza/issues/CLEREZZA-35/org.apache.clerezza.rdf.core:890756-891714
/incubator/clerezza/issues/CLEREZZA-67/org.apache.clerezza.rdf.core:897463-901252
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.core:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -2,3 +2,4 @@
/incubator/clerezza/issues/CLEREZZA-51/org.apache.clerezza.rdf.ontologies:893214-893434
/incubator/clerezza/issues/CLEREZZA-72/org.apache.clerezza.rdf.ontologies:898792-901144
/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.rdf.ontologies:905960-906078
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.ontologies/src/main/resources/org/apache/clerezza/rdf/ontologies/platform.rdf Tue Aug 17 07:28:52 2010
@@ -100,4 +100,15 @@ property.
<rdfs:range rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
</rdf:Property>
+<rdf:Property rdf:about="http://clerezza.org/2009/08/platform#preferredLangInISOCode">
+ <rdf:type rdf:resource="http://www.w3.org/2002/07/owl#DataProperty" />
+ <rdfs:label xml:lang="en">preferredLangInISOCode</rdfs:label>
+ <skos:definition xml:lang="en">Points to a literal which represents the ISO code of
+ a language.
+ </skos:definition>
+ <rdfs:isDefinedBy rdf:resource="http://clerezza.org/2009/08/platform#" />
+ <rdfs:domain rdf:resource="http://xmlns.com/foaf/0.1/Agent"/>
+ <rdfs:range rdf:resource="http://www.w3.org/2000/01/rdf-schema#Literal"/>
+</rdf:Property>
+
</rdf:RDF>
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.scala.utils/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-29/org.apache.clerezza.rdf.scala.utils:891751-892221
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.scala.utils:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-70/org.apache.clerezza.rdf.utils:901253-903625
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.rdf.utils:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.tools.offline/src/main/java/org/apache/clerezza/tools/offline/Generator.java Tue Aug 17 07:28:52 2010
@@ -234,12 +234,16 @@ public class Generator {
}
final String responseContentType = urlConnection.getContentType();
if (!responseContentType.startsWith(mediaType.toString())) {
- throw new VariantUnavailableException("Got "+responseContentType+" and not "+mediaType);
+ throw new VariantUnavailableException("Got " + responseContentType + " and not " + mediaType);
}
- final InputStream in = urlConnection.getInputStream();
final ByteArrayOutputStream baos = new ByteArrayOutputStream();
- for (int ch = in.read(); ch != -1; ch = in.read()) {
- baos.write(ch);
+ final InputStream in = urlConnection.getInputStream();
+ try {
+ for (int ch = in.read(); ch != -1; ch = in.read()) {
+ baos.write(ch);
+ }
+ } finally {
+ in.close();
}
return baos.toByteArray();
}
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -4,3 +4,4 @@
/incubator/clerezza/issues/CLEREZZA-48/org.apache.clerezza.triaxrs:893435-898896
/incubator/clerezza/issues/CLEREZZA-86/org.apache.clerezza.triaxrs:903135-910335
/incubator/clerezza/issues/CLEREZZA-94/org.apache.clerezza.triaxrs:905562-905566
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.triaxrs:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.triaxrs/org.apache.clerezza.triaxrs.tests/pom.xml Tue Aug 17 07:28:52 2010
@@ -113,20 +113,6 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-depends-file</id>
- <goals>
- <goal>generate-depends-file</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-config</id>
- <goals>
- <goal>generate-config</goal>
- </goals>
- </execution>
- </executions>
</plugin>
</plugins>
</build>
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,2 +1,3 @@
/incubator/clerezza/issues/CLEREZZA-42/org.apache.clerezza.utils.imagemagick:891740-891799
/incubator/clerezza/issues/CLEREZZA-51/org.apache.clerezza.utils.imagemagick:893180-893434
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/pom.xml?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/pom.xml Tue Aug 17 07:28:52 2010
@@ -38,5 +38,14 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza.ext</groupId>
+ <artifactId>org.im4java</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.im4java</groupId>
+ <artifactId>org.im4java</artifactId>
+ <version>1.1.0</version>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/main/java/org/apache/clerezza/utils/imagemagick/ImageMagickProvider.java Tue Aug 17 07:28:52 2010
@@ -36,7 +36,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import javax.imageio.ImageIO;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -55,6 +54,9 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.felix.scr.annotations.Services;
+import org.im4java.core.ConvertCmd;
+import org.im4java.core.IMOperation;
+import org.im4java.core.Stream2BufferedImage;
/**
* This class implements interfaces that execute system calls to imageMagick.
@@ -73,9 +75,9 @@ import org.apache.felix.scr.annotations.
@Property(name="convert", value="convert", description="Specifies the ImageMagick convert command."),
@Property(name="identify", value="identify", description="Specifies the ImageMagick identify command."),
@Property(name="release_number", intValue=6, description="Specifies ImageMagick release number (Syntax: release.version.majorRevision-minorRevision)."),
- @Property(name="version_number", intValue=5, description="Specifies ImageMagick version number (Syntax: release.version.majorRevision-minorRevision)."),
- @Property(name="major_release_number", intValue=2, description="Specifies ImageMagick major revision number (Syntax: release.version.majorRevision-minorRevision)."),
- @Property(name="minor_release_number", intValue=10, description="Specifies ImageMagick minor revision number (Syntax: release.version.majorRevision-minorRevision)."),
+ @Property(name="version_number", intValue=3, description="Specifies ImageMagick version number (Syntax: release.version.majorRevision-minorRevision)."),
+ @Property(name="major_release_number", intValue=7, description="Specifies ImageMagick major revision number (Syntax: release.version.majorRevision-minorRevision)."),
+ @Property(name="minor_release_number", intValue=9, description="Specifies ImageMagick minor revision number (Syntax: release.version.majorRevision-minorRevision)."),
@Property(name="service.ranking", value="100")
})
@Services({
@@ -87,35 +89,13 @@ public class ImageMagickProvider extends
private String convert = "convert";
private String identify = "identify";
- private int imagemagickRelease = 6;
- private int imagemagickVersion = 5;
- private int imagemagickRevisionMajorNumber = 2;
- private int imagemagickRevisionMinorNumber = 10;
+
@Reference
private Serializer serializer;
private final Logger logger = LoggerFactory.getLogger(getClass());
- protected void activate(ComponentContext cCtx) {
- if (cCtx != null) {
- convert = (String) cCtx.getProperties().get("convert");
- identify = (String) cCtx.getProperties().get("identify");
- imagemagickRelease = (Integer) cCtx.getProperties().
- get("release_number");
- imagemagickVersion = (Integer) cCtx.getProperties().
- get("version_number");
- imagemagickRevisionMajorNumber = (Integer) cCtx.getProperties().
- get("major_release_number");
- imagemagickRevisionMinorNumber = (Integer) cCtx.getProperties().
- get("minor_release_number");
- }
-
- checkImageMagickInstallation();
-
- logger.info("ImageMagickProvider activated");
- }
-
/**
* Default Constructor
*/
@@ -138,22 +118,17 @@ public class ImageMagickProvider extends
try {
List<String> command = new ArrayList<String>();
command.add(identify);
- command.add("--version");
+ command.add("-version");
Process proc = execCommand(command);
BufferedReader br = new BufferedReader(
new InputStreamReader(proc.getInputStream()));
String output = br.readLine();
br.close();
-
- ok = checkImageMagickVersion(output, imagemagickRelease,
- imagemagickVersion,
- imagemagickRevisionMajorNumber,
- imagemagickRevisionMinorNumber);
-
+
command.clear();
command.add(convert);
- command.add("--version");
+ command.add("-version");
proc = execCommand(command);
br = new BufferedReader(new InputStreamReader(proc.getInputStream()));
@@ -162,8 +137,7 @@ public class ImageMagickProvider extends
if(output!=null && !output.contains("Version: ImageMagick")) {
ok = false;
- }
-
+ }
} catch (InterruptedException ex) {
Thread.currentThread().interrupt();
@@ -179,49 +153,10 @@ public class ImageMagickProvider extends
}
if(!ok) {
- logger.error("ImageMagick version can not be verified. " +
- "Please make sure you have ImageMagick (>=" +
- imagemagickRelease + "." + imagemagickVersion + "." +
- imagemagickRevisionMajorNumber + "-" +
- imagemagickRevisionMinorNumber +
- ") installed correctly");
-
throw new RuntimeException("ImageMagick not installed correctly.");
}
}
- private boolean checkImageMagickVersion(String str, int release, int version,
- int revision_major_number, int revision_minor_number) {
-
- Pattern pattern = Pattern.compile("(\\d+\\.){2}\\d+-\\d+");
- Matcher matcher = pattern.matcher(str);
-
- boolean error = false;
- if (matcher.find()) {
- String versionString = matcher.group();
- String[] versionParts = versionString.split("\\.");
- if (Integer.parseInt(versionParts[0]) < release) {
- error = true;
- } else if (Integer.parseInt(versionParts[0]) == release) {
- if (Integer.parseInt(versionParts[1]) < version) {
- error = true;
- } else if (Integer.parseInt(versionParts[1]) == version) {
- String[] revisionParts = versionParts[2].split("-");
- if (Integer.parseInt(revisionParts[0]) < revision_major_number) {
- error = true;
- } else if (Integer.parseInt(revisionParts[0]) == revision_major_number) {
- if (Integer.parseInt(revisionParts[1]) < revision_minor_number) {
- error = true;
- }
- }
- }
- }
- return !error;
- } else {
- return false;
- }
- }
-
@Override
public BufferedImage makeImageTranslucent(BufferedImage image,
float translucency) {
@@ -235,86 +170,76 @@ public class ImageMagickProvider extends
@Override
public BufferedImage flip(BufferedImage image, int direction) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
+ IMOperation op = new IMOperation();
if (direction == 0) {
- command.add("-flop");
+ op.flop();
} else {
- command.add("-flip");
+ op.flip();
}
-
- return processImage(command, 100, image);
+ return processImage(op, image);
}
@Override
public BufferedImage rotate(BufferedImage image, int angle) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
- command.add("-rotate");
- command.add("" + angle);
-
- return processImage(command, 100, image);
+ IMOperation op = new IMOperation();
+ op.rotate(Double.valueOf(angle));
+ return processImage(op, image);
}
@Override
public BufferedImage resize(BufferedImage image, int newWidth, int newHeight) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
- command.add("-geometry");
- command.add(newWidth + "x" + newHeight + "!");
-
- return processImage(command, 100, image);
+ IMOperation op = new IMOperation();
+ op.resize(newWidth == 0 ? null : newWidth, newHeight == 0 ? null : newHeight, "!");
+ return processImage(op, image);
}
@Override
public BufferedImage resizeProportional(BufferedImage image, int newWidth,
int newHeight) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
- command.add("-geometry");
- if (newWidth != 0) {
- command.add("" + newWidth);
- } else {
- if (newHeight != 0) {
- command.add("x" + newHeight);
- } else {
- return image;
- }
- }
-
- return processImage(command, 100, image);
+ IMOperation op = new IMOperation();
+ op.resize(newWidth == 0 ? null : newWidth, newWidth !=0 || newHeight == 0 ? null : newHeight);
+ return processImage(op, image);
}
@Override
public BufferedImage resizeRelative(BufferedImage image,
float resizeFactorWidth, float resizeFactorHeight) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
- command.add("-geometry");
- command.add((100 * resizeFactorWidth) + "%x"
- + (100 * resizeFactorHeight) + "%");
-
- return processImage(command, 100, image);
+ IMOperation op = new IMOperation();
+ Integer newWidth = Float.valueOf(image.getWidth() * resizeFactorWidth).intValue();
+ Integer newHeight = Float.valueOf(image.getHeight() * resizeFactorHeight).intValue();
+ op.resize(newWidth, newHeight, "!");
+ return processImage(op, image);
}
@Override
public BufferedImage resizeRelativeProportional(BufferedImage image,
float resizeFactor) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
- command.add("-geometry");
- command.add(100 * resizeFactor + "%");
-
- return processImage(command, 100, image);
+ IMOperation op = new IMOperation();
+ Integer width = Float.valueOf(image.getWidth() * resizeFactor).intValue();
+ op.resize(width);
+ return processImage(op, image);
}
- private BufferedImage crop(BufferedImage image, int newWidth, int newHeight) {
- List<String> command = new ArrayList<String>(10);
- command.add(convert);
- command.add("-crop");
- command.add(newWidth + "x" + newHeight);
+ @Override
+ public BufferedImage makeAThumbnail(BufferedImage image, int width, int height) {
+ IMOperation op = new IMOperation();
+ op.thumbnail(width, height);
+ return processImage(op, image);
+ }
- return processImage(command, 100, image);
+ private BufferedImage processImage(IMOperation ops, BufferedImage image) {
+ ConvertCmd convertCmd = new ConvertCmd();
+ ops.addImage();
+ ops.addImage("jpg:-");
+ Stream2BufferedImage s2b = new Stream2BufferedImage();
+ convertCmd.setOutputConsumer(s2b);
+ try {
+ convertCmd.run(ops, image);
+ } catch(Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ BufferedImage img = s2b.getImage();
+ return img;
}
@Override
@@ -548,35 +473,6 @@ public class ImageMagickProvider extends
return null;
}
-
-
- private BufferedImage processImage(List<String> command, int quality,
- BufferedImage image) {
- command.add("-quality");
- command.add(String.valueOf(quality));
- command.add("-");
- command.add("-");
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- if (ImageIO.write(image, "png", baos) == false) {
- logger.warn("Cannot write image to output stream");
- return null;
- }
-
- return ImageIO.read(execCommand(command, baos.toByteArray()).
- getInputStream());
-
- } catch (InterruptedException ex) {
- logger.warn("ImageMagick has been interrupted");
- Thread.currentThread().interrupt();
- return null;
- } catch (IOException ex) {
- logger.warn("IOException while trying to execute {}", command);
- return null;
- }
- }
-
private Process execCommand(List<String> command,
byte[]... inputData) throws IOException,
InterruptedException {
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imagemagick/src/test/java/org/apache/clerezza/utils/imagemagick/ImageMagickUtilsTest.java Tue Aug 17 07:28:52 2010
@@ -70,6 +70,67 @@ public class ImageMagickUtilsTest {
BufferedImage bimg = ip.flip(ImageIO.read(in), 0);
assert(bimg != null);
}
+
+ @Test
+ public void resizeProportionalTest() throws IOException {
+ Assume.assumeTrue(correctlyInstalled);
+ ImageMagickProvider ip = new ImageMagickProvider();
+ BufferedImage inputImage = ImageIO.read(
+ getClass().getResourceAsStream("rocket.jpg"));
+ BufferedImage outputImage = ip.resizeProportional(inputImage, 200, 200);
+ assert(outputImage != null);
+ Assert.assertEquals(200, outputImage.getWidth());
+ Assert.assertEquals(250, outputImage.getHeight());
+ }
+
+ @Test
+ public void resizeTest() throws IOException {
+ Assume.assumeTrue(correctlyInstalled);
+ ImageMagickProvider ip = new ImageMagickProvider();
+ BufferedImage inputImage = ImageIO.read(
+ getClass().getResourceAsStream("rocket.jpg"));
+ BufferedImage outputImage = ip.resize(inputImage, 200, 200);
+ assert(outputImage != null);
+ Assert.assertEquals(200, outputImage.getHeight());
+ Assert.assertEquals(200, outputImage.getWidth());
+ }
+
+ @Test
+ public void resizeRelativeProportionalTest() throws IOException {
+ Assume.assumeTrue(correctlyInstalled);
+ ImageMagickProvider ip = new ImageMagickProvider();
+ BufferedImage inputImage = ImageIO.read(
+ getClass().getResourceAsStream("rocket.jpg"));
+ BufferedImage outputImage = ip.resizeRelativeProportional(inputImage, Float.valueOf(".5"));
+ assert(outputImage != null);
+ Assert.assertEquals(inputImage.getWidth() / 2, outputImage.getWidth());
+ Assert.assertEquals(inputImage.getHeight() / 2, outputImage.getHeight());
+ }
+
+ @Test
+ public void resizeRelativeTest() throws IOException {
+ Assume.assumeTrue(correctlyInstalled);
+ ImageMagickProvider ip = new ImageMagickProvider();
+ BufferedImage inputImage = ImageIO.read(
+ getClass().getResourceAsStream("rocket.jpg"));
+ BufferedImage outputImage = ip.resizeRelative(inputImage, Float.valueOf(".5"),
+ Float.valueOf(".25"));
+ assert(outputImage != null);
+ Assert.assertEquals(inputImage.getHeight() / 4, outputImage.getHeight());
+ Assert.assertEquals(inputImage.getWidth() / 2, outputImage.getWidth());
+ }
+
+ @Test
+ public void thumbnailTest() throws IOException {
+ Assume.assumeTrue(correctlyInstalled);
+ ImageMagickProvider ip = new ImageMagickProvider();
+ BufferedImage inputImage = ImageIO.read(
+ getClass().getResourceAsStream("rocket.jpg"));
+ BufferedImage outputImage = ip.makeAThumbnail(inputImage, 200, 200);
+ Assert.assertEquals(200, outputImage.getHeight());
+ Assert.assertEquals(160, outputImage.getWidth());
+ assert(outputImage != null);
+ }
@Test
public void extractMetaDataTest() throws IOException {
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.utils.imageprocessing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-42/org.apache.clerezza.utils.imageprocessing:891738-891799
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.utils.imageprocessing:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.jquery:894321-894392
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.jquery:984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,2 +1,2 @@
/incubator/clerezza/issues/CLEREZZA-47/org.apache.clerezza.web.resources.scripts:892743-917522
-/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts:916331-916719
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.scripts:916331-916719,984367-986214
Propchange: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 17 07:28:52 2010
@@ -1,3 +1,4 @@
/incubator/clerezza/issues/CLEREZZA-52/org.apache.clerezza.web.resources.style:894321-894392
/incubator/clerezza/issues/CLEREZZA-77/org.apache.clerezza.web.resources.style:900408-902859
/incubator/clerezza/issues/CLEREZZA-87/org.apache.clerezza.web.resources.style:905960-908526
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style:984367-986214
Modified: incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/pom.xml?rev=986220&r1=986219&r2=986220&view=diff
==============================================================================
--- incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/issues/CLEREZZA-270/org.apache.clerezza.parent/pom.xml Tue Aug 17 07:28:52 2010
@@ -217,7 +217,7 @@
<plugin>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>maven-paxexam-plugin</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.1</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -478,9 +478,9 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.1</version>
</dependency>
- <!-- this is a dependecy of pax-exam, enforcing latest version
+ <!-- this is a dependecy of pax-exam, enforcing latescat t version
to get latest felix -->
<dependency>
<groupId>org.ops4j.pax.runner</groupId>
@@ -490,12 +490,22 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit-extender-impl</artifactId>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>1.2.1-SNAPSHOT</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.sun.script.jruby</groupId>