Author: hasan
Date: Tue Jun 14 16:53:43 2011
New Revision: 1135697
URL: http://svn.apache.org/viewvc?rev=1135697&view=rev
Log:
CLEREZZA-563: used web site style as default style for platform
Added:
incubator/clerezza/trunk/parent/platform.style.classic/
- copied from r1133867,
incubator/clerezza/trunk/parent/web.resources.style/
incubator/clerezza/trunk/parent/platform.style.classic.webguiexamples/
- copied from r1135641,
incubator/clerezza/trunk/parent/app.webguiexamples/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/Style.java
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/globalmenu-naked.ssp
- copied, changed from r1133867,
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/headed-page-template.ssp
- copied unchanged from r1133867,
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/headed-page-template.ssp
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/rdf-list-template.ssp
- copied unchanged from r1133867,
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/rdf-list-template.ssp
incubator/clerezza/trunk/parent/platform.style.default/
- copied from r1133869, incubator/clerezza/site/trunk/
Removed:
incubator/clerezza/trunk/parent/app.webguiexamples/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/web/
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/web/
incubator/clerezza/trunk/parent/platform.style.default/deploy.sh
incubator/clerezza/trunk/parent/platform.style.default/graph.nt
incubator/clerezza/trunk/parent/platform.style.default/readme.txt
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/Ontology.scala
Modified:
incubator/clerezza/trunk/parent/platform.content.representations/platform.content.representations.core/pom.xml
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/parent/platform.style.classic.webguiexamples/pom.xml
incubator/clerezza/trunk/parent/platform.style.classic/pom.xml
incubator/clerezza/trunk/parent/platform.style.default/pom.xml
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/
(props changed)
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/Activator.scala
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/TitledContentRenderlet.scala
incubator/clerezza/trunk/parent/platform.testing/pom.xml
incubator/clerezza/trunk/parent/pom.xml
Modified:
incubator/clerezza/trunk/parent/platform.content.representations/platform.content.representations.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.content.representations/platform.content.representations.core/pom.xml?rev=1135697&r1=1135696&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.content.representations/platform.content.representations.core/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.content.representations/platform.content.representations.core/pom.xml
Tue Jun 14 16:53:43 2011
@@ -41,10 +41,12 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.content</artifactId>
</dependency>
+<!--
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>web.resources.style</artifactId>
</dependency>
+-->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.content.representations.ontologies</artifactId>
Modified:
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml?rev=1135697&r1=1135696&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
Tue Jun 14 16:53:43 2011
@@ -512,7 +512,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.style</artifactId>
+ <artifactId>platform.style.default</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -560,11 +560,13 @@
<artifactId>platform.language.core</artifactId>
<scope>runtime</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>app.webguiexamples</artifactId>
+
<artifactId>platform.style.classic.webguiexamples</artifactId>
<scope>runtime</scope>
</dependency>
+-->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.concepts.core</artifactId>
Modified:
incubator/clerezza/trunk/parent/platform.style.classic.webguiexamples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.classic.webguiexamples/pom.xml?rev=1135697&r1=1135641&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.classic.webguiexamples/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.style.classic.webguiexamples/pom.xml
Tue Jun 14 16:53:43 2011
@@ -6,7 +6,7 @@
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>app.webguiexamples</artifactId>
+ <artifactId>platform.style.classic.webguiexamples</artifactId>
<packaging>bundle</packaging>
<version>0.2-incubating-SNAPSHOT</version>
<name>Clerezza - Web GUI Examples</name>
@@ -46,10 +46,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
-
<Require-Bundle>org.apache.clerezza.web.resources.style,
org.apache.clerezza.web.resources.jquery</Require-Bundle>
+
<Require-Bundle>org.apache.clerezza.platform.style.classic,
org.apache.clerezza.web.resources.jquery</Require-Bundle>
</instructions>
</configuration>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/clerezza/trunk/parent/platform.style.classic/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.classic/pom.xml?rev=1135697&r1=1133867&r2=1135697&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.style.classic/pom.xml (original)
+++ incubator/clerezza/trunk/parent/platform.style.classic/pom.xml Tue Jun 14
16:53:43 2011
@@ -6,10 +6,10 @@
<version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.style</artifactId>
+ <artifactId>platform.style.classic</artifactId>
<packaging>bundle</packaging>
<version>0.4-incubating-SNAPSHOT</version>
- <name>Clerezza - Style</name>
+ <name>Clerezza - Classic Style</name>
<description>
Icons and css for HTML pages
</description>
Added:
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/Style.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/Style.java?rev=1135697&view=auto
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/Style.java
(added)
+++
incubator/clerezza/trunk/parent/platform.style.classic/src/main/java/org/apache/clerezza/platform/style/classic/Style.java
Tue Jun 14 16:53:43 2011
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.clerezza.platform.style.classic;
+
+import java.net.URL;
+
+
+import javax.ws.rs.core.MediaType;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import
org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesService;
+import org.apache.clerezza.rdf.ontologies.HIERARCHY;
+import org.apache.clerezza.rdf.ontologies.PLATFORM;
+import org.apache.clerezza.rdf.ontologies.RDF;
+import org.apache.clerezza.rdf.ontologies.RDFS;
+import org.osgi.service.component.ComponentContext;
+
+/**
+ * Registers the Scala Sever PAges provided by this bundle.
+ *
+ * @author tio, reto
+ */
+@Component(immediate=true)
+public class Style {
+
+ @Reference
+ private ScalaServerPagesService sspService;
+
+ /**
+ * configuration.
+ *
+ * @param context
+ */
+ protected void activate(ComponentContext context) {
+ URL templateURL =
getClass().getResource("globalmenu-naked.ssp");
+ sspService.registerScalaServerPage(templateURL, RDFS.Resource,
"menu",
+ MediaType.APPLICATION_XHTML_XML_TYPE);
+
+ templateURL = getClass().getResource("rdf-list-template.ssp");
+ sspService.registerScalaServerPage(templateURL, RDF.List,
".*naked",
+ MediaType.APPLICATION_XHTML_XML_TYPE);
+
+ templateURL =
getClass().getResource("headed-page-template.ssp");
+ sspService.registerScalaServerPage(templateURL,
PLATFORM.HeadedPage, "(?!.*naked).*",
+ MediaType.APPLICATION_XHTML_XML_TYPE);
+
+ templateURL =
getClass().getResource("headed-page-template.ssp");
+ sspService.registerScalaServerPage(templateURL,
HIERARCHY.Collection, "(?!.*naked).*",
+ MediaType.APPLICATION_XHTML_XML_TYPE);
+ }
+
+}
Copied:
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/globalmenu-naked.ssp
(from r1133867,
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp)
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/globalmenu-naked.ssp?p2=incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/globalmenu-naked.ssp&p1=incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp&r1=1133867&r2=1135697&rev=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/web.resources.style/src/main/resources/org/apache/clerezza/web/resources/style/globalmenu-naked.ssp
(original)
+++
incubator/clerezza/trunk/parent/platform.style.classic/src/main/resources/org/apache/clerezza/platform/style/classic/globalmenu-naked.ssp
Tue Jun 14 16:53:43 2011
@@ -16,13 +16,18 @@ resultDocModifier.addScriptReference("/s
</div>
<div id="tx-login">
{
- val username =
(context/platform("user")/platform("userName")*)
- if((username).equals("anonymous")) {
+ val userName =
context/platform("user")/platform("userName")*
+ val displayName = if
((context/platform("user")/FOAF.name).length == 0) {
+ userName
+ } else {
+
context/platform("user")/FOAF.name*
+ }
+ if((userName).equals("anonymous")) {
<span>
<a href="#"
id="tx-login-button">login</a>
</span>
} else {
- <span><a href={"/user/" +
username + "/control-panel"}>{username}</a>|<a href="/logout">logout</a></span>
+ <span><a href={"/user/" +
userName + "/control-panel"}>{displayName}</a>|<a
href="/logout">logout</a></span>
}
}
</div>
Modified: incubator/clerezza/trunk/parent/platform.style.default/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.default/pom.xml?rev=1135697&r1=1133869&r2=1135697&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.style.default/pom.xml (original)
+++ incubator/clerezza/trunk/parent/platform.style.default/pom.xml Tue Jun 14
16:53:43 2011
@@ -5,10 +5,10 @@
<artifactId>parent</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</parent>
- <artifactId>website</artifactId>
+ <artifactId>platform.style.default</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Clerezza - Website</name>
+ <name>Clerezza - Default Style</name>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -60,8 +60,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
-
<Bundle-activator>skeleton.Activator</Bundle-activator>
-
<Export-Package>skeleton</Export-Package>
+
<Bundle-activator>org.apache.clerezza.platform.style.default.Activator</Bundle-activator>
+
<Export-Package>org.apache.clerezza.platform.style.default</Export-Package>
<Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
</instructions>
</configuration>
Propchange:
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 14 16:53:43 2011
@@ -0,0 +1 @@
+.HeadedPageRenderlet.scala.swp
Modified:
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/Activator.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/Activator.scala?rev=1135697&r1=1133869&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/Activator.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/Activator.scala
Tue Jun 14 16:53:43 2011
@@ -1,10 +1,11 @@
-package org.apache.clerezza.site
+package org.apache.clerezza.platform.style.default
import org.osgi.framework.{BundleActivator, BundleContext, ServiceRegistration}
import scala.collection.JavaConversions.asJavaDictionary
import org.apache.clerezza.platform.typerendering.{TypeRenderlet,
RenderletManager}
import org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider
import org.apache.clerezza.rdf.core.access.TcManager
+import org.apache.clerezza.osgi.services.ActivationHelper
import org.apache.clerezza.osgi.services.ServicesDsl
import org.apache.clerezza.platform.Constants
import org.apache.clerezza.rdf.core.event.{GraphEvent, FilterTriple,
GraphListener}
@@ -14,78 +15,10 @@ import java.io.{FileOutputStream, FileIn
/**
* Activator for a bundle using Apache Clerezza.
*/
-class Activator extends BundleActivator {
-
- var renderletRegistration,
- titledContentRenderletRegistration,
- globalMenuRenderletRegistration: ServiceRegistration = null
- var graphListenerOption: Option[GraphListener] = null
-
- /**
- * called when the bundle is started, this method initializes the
provided service
- */
- def start(context: BundleContext) {
- val servicesDsl = new ServicesDsl(context)
- import servicesDsl._
-
- val renderlet = new HeadedPageRenderlet
- renderletRegistration =
context.registerService(classOf[TypeRenderlet].getName,
-
renderlet, null)
- titledContentRenderletRegistration =
context.registerService(classOf[TypeRenderlet].getName,
-
new TitledContentRenderlet, null)
- globalMenuRenderletRegistration =
context.registerService(classOf[TypeRenderlet].getName,
-
new GlobalMenuRenderlet, null)
-
context.installBundle("mvn:org.apache.clerezza/rdf.stable.serializer").start();
-
context.installBundle("mvn:org.apache.clerezza/tools.offline").start();
- val path = {
- val bl = context.getBundle.getLocation
- bl.substring(bl.indexOf(':')+1)
- }
- val graphFile = new File(new File(path), "graph.nt");
- doWith {
- (tcManager: TcManager, parser: Parser) => {
- val contentGraph =
tcManager.getMGraph(Constants.CONTENT_GRAPH_URI)
- val fileGraph = parser.parse(new
FileInputStream(graphFile), SupportedFormat.N_TRIPLE)
- if (contentGraph.size > fileGraph.size) {
- println("content graph if bigger than
the graph from file, not replacing with the content from file and not " +
- "writing any data to the file,
you should manually either write the content graph to the file or clear " +
- "the content graph. Restart
this bundle after resolving the issue.")
- graphListenerOption = None
- } else {
- contentGraph.clear
- contentGraph.addAll(fileGraph)
- println("the content graph has been
replaced with "+graphFile)
- object graphListener extends
GraphListener {
- val serializer = $[Serializer]
- override def
graphChanged(events: java.util.List[GraphEvent]) {
-
serializer.serialize(new FileOutputStream(graphFile),
contentGraph,SupportedFormat.N_TRIPLE)
- }
- }
-
contentGraph.addGraphListener(graphListener, new FilterTriple(null, null,
null), 2000)
- graphListenerOption =
Some(graphListener)
- println("A GraphListener has been added
that writes changes to the content graph to graph.nt")
- }
- }
- }
- }
-
-
- /**
- * called when the bundle is stopped, this method unregisters the
provided service
- */
- def stop(context: BundleContext) {
- renderletRegistration.unregister()
- titledContentRenderletRegistration.unregister()
- globalMenuRenderletRegistration.unregister()
- val servicesDsl = new ServicesDsl(context)
- import servicesDsl._
- val tcManager = $[TcManager]
- val contentGraph =
tcManager.getMGraph(Constants.CONTENT_GRAPH_URI)
- graphListenerOption match {
- case Some(l) => contentGraph.removeGraphListener(l)
- case None => ;
- }
- println("bye")
- }
+class Activator extends ActivationHelper {
+ registerRenderlet(new GlobalMenuRenderlet)
+ registerRenderlet(new HeadedPageRenderlet)
+ registerRenderlet(new TitledContentRenderlet)
+
}
Modified:
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala?rev=1135697&r1=1133869&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/GlobalMenuRenderlet.scala
Tue Jun 14 16:53:43 2011
@@ -1,4 +1,4 @@
-package org.apache.clerezza.site
+package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
@@ -34,9 +34,6 @@ def rdfs(s: Any) = new UriRef("http://ww
def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
def dct(s: Any) = new UriRef("http://purl.org/dc/terms/"+s)
-resultDocModifier.addScriptReference("/style/scripts/login.js");
-
-
<div class="column nav">
<ul>
Modified:
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/HeadedPageRenderlet.scala?rev=1135697&r1=1133869&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/HeadedPageRenderlet.scala
Tue Jun 14 16:53:43 2011
@@ -1,4 +1,4 @@
-package org.apache.clerezza.site
+package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
@@ -71,7 +71,9 @@ resultDocModifier.addScriptReference("/s
val username =
(context/platform("user")/platform("userName")*)
if((username).equals("anonymous")) {
<span>
- <a
href="#" id="tx-login-button">login</a>
+ <a
href={"/login?referer=" + java.net.URLEncoder.encode(
+
arguments.requestProperties.getUriInfo.getRequestUri.toString,
"utf-8")}
+
id="tx-login-button">login</a>
</span>
} else {
<span><a
href={"/user/" + username + "/control-panel"}>{username}</a>|<a
href="/logout">logout</a></span>
Modified:
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/TitledContentRenderlet.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/TitledContentRenderlet.scala?rev=1135697&r1=1133869&r2=1135697&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/TitledContentRenderlet.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.style.default/src/main/scala/TitledContentRenderlet.scala
Tue Jun 14 16:53:43 2011
@@ -1,4 +1,4 @@
-package org.apache.clerezza.site
+package org.apache.clerezza.platform.style.default
import javax.ws.rs.core.MediaType
import org.apache.clerezza.platform.typerendering._
Modified: incubator/clerezza/trunk/parent/platform.testing/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.testing/pom.xml?rev=1135697&r1=1135696&r2=1135697&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/platform.testing/pom.xml (original)
+++ incubator/clerezza/trunk/parent/platform.testing/pom.xml Tue Jun 14
16:53:43 2011
@@ -315,11 +315,13 @@
<artifactId>web.resources.scripts</artifactId>
<scope>provided</scope>
</dependency>
+<!--
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.style</artifactId>
+ <artifactId>platform.style.classic</artifactId>
<scope>provided</scope>
</dependency>
+-->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
@@ -352,7 +354,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>app.webguiexamples</artifactId>
+
<artifactId>platform.style.classic.webguiexamples</artifactId>
<scope>provided</scope>
</dependency>
Modified: incubator/clerezza/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/pom.xml?rev=1135697&r1=1135696&r2=1135697&view=diff
==============================================================================
--- incubator/clerezza/trunk/parent/pom.xml (original)
+++ incubator/clerezza/trunk/parent/pom.xml Tue Jun 14 16:53:43 2011
@@ -25,7 +25,7 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
- <module>app.webguiexamples</module>
+
<module>platform.style.classic.webguiexamples</module>
<module>ext.com.hp.hpl.jena</module>
<module>ext.com.hp.hpl.jena.tdb</module>
<module>ext.com.ibm.icu</module>
@@ -124,7 +124,8 @@
<module>web.fileserver</module>
<module>web.resources.jquery</module>
<module>web.resources.scripts</module>
- <module>web.resources.style</module>
+ <module>platform.style.default</module>
+ <module>platform.style.classic</module>
<module>web.resources.yui</module>
<module>rdf.storage.externalizer</module>
<module>rdf.storage.web</module>
@@ -699,7 +700,12 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>web.resources.style</artifactId>
+ <artifactId>platform.style.default</artifactId>
+ <version>0.1-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.style.classic</artifactId>
<version>0.4-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -1164,7 +1170,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>app.webguiexamples</artifactId>
+
<artifactId>platform.style.classic.webguiexamples</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
