Author: bblfish
Date: Mon Apr 4 09:28:57 2011
New Revision: 1088521
URL: http://svn.apache.org/viewvc?rev=1088521&view=rev
Log:
removed some uncessary code
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml?rev=1088521&r1=1088520&r2=1088521&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
Mon Apr 4 09:28:57 2011
@@ -115,11 +115,6 @@
<artifactId>rdf.web.proxy.core</artifactId>
<version>0.2-incubating-SNAPSHOT</version>
</dependency>
- <!--dependency>
- <groupId>org.apache.felix</groupId>
-
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version></version>
- </dependency-->
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
@@ -130,10 +125,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
-
<artifactId>platform.typerendering.scalaserverpages</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scala</artifactId>
</dependency>
<dependency>
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml?rev=1088521&r1=1088520&r2=1088521&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml
(original)
+++
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/resources/OSGI-INF/serviceComponents.xml
Mon Apr 4 09:28:57 2011
@@ -25,7 +25,6 @@
<property name="service.pid"
value="org.apache.clerezza.platform.accountcontrolpanel.SettingsPanel"/>
<reference name="configurationAdmin"
interface="org.osgi.service.cm.ConfigurationAdmin" cardinality="0..1"
policy="dynamic" bind="bindConfigurationAdmin"
unbind="unbindConfigurationAdmin"/>
<reference name="systemGraph"
interface="org.apache.clerezza.rdf.core.MGraph" cardinality="1..1"
policy="static" target="(name=http://tpf.localhost/system.graph)"
bind="bindSystemGraph" unbind="unbindSystemGraph"/>
- <reference name="renderletManager"
interface="org.apache.clerezza.platform.typerendering.RenderletManager"
cardinality="1..1" policy="static" bind="bindRenderletManager"
unbind="unbindRenderletManager"/>
<reference name="cgProvider"
interface="org.apache.clerezza.platform.graphprovider.content.ContentGraphProvider"
cardinality="1..1" policy="static" bind="bindCgProvider"
unbind="unbindCgProvider"/>
</scr:component>
<scr:component enabled="true"
name="org.apache.clerezza.platform.accountcontrolpanel.settings_panel">
Modified:
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala?rev=1088521&r1=1088520&r2=1088521&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.accountcontrolpanel/platform.accountcontrolpanel.core/src/main/scala/org/apache/clerezza/platform/accountcontrolpanel/SettingsPanel.scala
Mon Apr 4 09:28:57 2011
@@ -630,16 +630,6 @@ class SettingsPanel {
}
}
- protected def bindRenderletManager(renderletmanager: RenderletManager):
Unit = {
- renderletManager = renderletmanager
- }
-
- protected def unbindRenderletManager(renderletmanager:
RenderletManager): Unit = {
- if (renderletManager == renderletmanager) {
- renderletManager = null
- }
- }
-
protected def bindCgProvider(contentgraphprovider:
ContentGraphProvider): Unit = {
cgProvider = contentgraphprovider
}
@@ -652,7 +642,6 @@ class SettingsPanel {
private var componentContext: ComponentContext = null
private var systemGraph: MGraph = null
- private var renderletManager: RenderletManager = null
private var cgProvider: ContentGraphProvider = null
private var configAdmin: ConfigurationAdmin = null
}
\ No newline at end of file
