Author: reto
Date: Sun Mar 20 01:06:02 2011
New Revision: 1083356
URL: http://svn.apache.org/viewvc?rev=1083356&view=rev
Log:
CLEREZZA-460: added default modePattern and MediaType to SRenderlet
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
incubator/clerezza/trunk/parent/platform.security.foafssl/ (props changed)
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
incubator/clerezza/trunk/parent/platform.users/ (props changed)
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala?rev=1083356&r1=1083355&r2=1083356&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/person_panel.scala
Sun Mar 20 01:06:02 2011
@@ -136,8 +136,6 @@ object person_panel {
class person_panel extends SRenderlet {
def getRdfType() = CONTROLPANEL.ProfileViewerPage
- def getMediaType() =MediaType.APPLICATION_XHTML_XML_TYPE
- def getModePattern() = "naked"
import person_panel._
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala?rev=1083356&r1=1083355&r2=1083356&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/profile_panel.scala
Sun Mar 20 01:06:02 2011
@@ -32,8 +32,6 @@ import javax.ws.rs.core.MediaType
class profile_panel extends SRenderlet {
def getRdfType() = CONTROLPANEL.ProfilePage
- def getMediaType() =MediaType.APPLICATION_XHTML_XML_TYPE
- def getModePattern() = "naked"
override def renderedPage(arguments: XmlResult.Arguments) = {
new XmlResult(arguments) {
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=1083356&r1=1083355&r2=1083356&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.launcher.storageless.parent/pom.xml
Sun Mar 20 01:06:02 2011
@@ -80,13 +80,21 @@
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-library-osgi</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
+ <version>2.8.1_1</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-compiler-osgi</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.scala-compiler</artifactId>
+ <version>2.8.1_1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ <version>0.9.94_1</version>
<scope>runtime</scope>
</dependency>
<dependency>
Propchange: incubator/clerezza/trunk/parent/platform.security.foafssl/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 20 01:06:02 2011
@@ -0,0 +1 @@
+target
Modified:
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala?rev=1083356&r1=1083355&r2=1083356&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/SRenderlet.scala
Sun Mar 20 01:06:02 2011
@@ -82,5 +82,9 @@ trait SRenderlet extends TypeRenderlet {
}
+ override def getMediaType() = MediaType.APPLICATION_XHTML_XML_TYPE
+
+ def getModePattern = "naked"
+
}
Propchange: incubator/clerezza/trunk/parent/platform.users/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Mar 20 01:06:02 2011
@@ -0,0 +1 @@
+target
