You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/10/17 13:16:36 UTC
svn commit: r705561 - in /geronimo/gshell/trunk:
gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/
gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/
Author: jdillon
Date: Fri Oct 17 04:16:36 2008
New Revision: 705561
URL: http://svn.apache.org/viewvc?rev=705561&view=rev
Log:
Moved branding parent hack
Modified:
geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
Modified: geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java?rev=705561&r1=705560&r2=705561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java (original)
+++ geronimo/gshell/trunk/gshell-model/src/main/java/org/apache/geronimo/gshell/model/application/ApplicationModel.java Fri Oct 17 04:16:36 2008
@@ -126,6 +126,9 @@
public void setBranding(final Branding branding) {
this.branding = branding;
+
+ // HACK: Hookup parent
+ branding.setParent(this);
}
/**
Modified: geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java?rev=705561&r1=705560&r2=705561&view=diff
==============================================================================
--- geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java (original)
+++ geronimo/gshell/trunk/gshell-wisdom/gshell-wisdom-bootstrap/src/main/java/org/apache/geronimo/gshell/wisdom/builder/ShellBuilderImpl.java Fri Oct 17 04:16:36 2008
@@ -157,9 +157,6 @@
ApplicationModel applicationModel = container.getBean(ApplicationModel.class);
applicationConfig.setModel(applicationModel);
- // HACK: Hookup branding's parent
- applicationModel.getBranding().setParent(applicationModel);
-
// Configure application
getApplicationManager().configure(applicationConfig);