geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r370961 - in /geronimo/branches/1.0: assemblies/j2ee-installer/src/izpack/ modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ modules/installer-support/src/java/com/izforge/izpack/panels/
Date Sat, 21 Jan 2006 02:32:17 GMT
Author: djencks
Date: Fri Jan 20 18:32:10 2006
New Revision: 370961

URL: http://svn.apache.org/viewcvs?rev=370961&view=rev
Log:
GERONIMO-1505, GERONIMO-1514, GERONIMO-1517 Fix copyright statements of modified izpack files,
fix tomcat activation, install derby with j2ee-features.

Modified:
    geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
    geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml
    geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
    geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/geronimo-izpack.xml Fri Jan
20 18:32:10 2006
@@ -192,11 +192,10 @@
           <description>Select the SMTP Transport functionality to enable JavaMail applications
in Geronimo.  Outbound JavaMail is sent through the SMTP Transport to a specified mail host.</description>
           <depends packname="J2EE Features" />
         </pack>
-        <pack name="Sample Database Pool" required="no" preselected="no">
-            <!-- o/o/g/DefaultDatabase -->
+        <!--pack name="Sample Database Pool" required="no" preselected="no">
             <description>A sample embedded database, using the Derby RDBMS.  If selected,
this creates a database pool that connects to the "DefaultDatabase" database running in the
embedded Derby installation.  If not selected, this configuration will be available but would
need to be manually activated later.  The "DefaultDatabase" database will be created the first
time this configuration is run.</description>
             <depends packname="J2EE Features" />
-        </pack>
+        </pack-->
         <!-- pack name="Spring Integration" required="no" preselected="no"-->
             <!-- o/o/g/SpringRuntime -->
             <!-- o/o/g/SpringDeployer -->

Modified: geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml (original)
+++ geronimo/branches/1.0/assemblies/j2ee-installer/src/izpack/izpack-user-input.xml Fri Jan
20 18:32:10 2006
@@ -222,21 +222,14 @@
         </field>
     </panel>
     <panel order="5">
-        <createForPack name="Sample Database Pool"/>
+        <createForPack name="J2EE Features"/>
         <field type="title" txt="Derby Configuration"/>
-        <field type="staticText" txt="Please configure Derby"/>
+        <field type="staticText" txt="Configure Derby, the sample database engine."/>
         <divider/>
         <field type="rule" variable="PlanDerbyPort">
             <description txt="The network port that the Derby DB should use"/>
             <spec txt="Derby Port [1527]:" layout="N:5:5" set="0:1527"/>
             <validator class="com.izforge.izpack.util.NotEmptyValidator"/>
-        </field>
-        <field type="check" variable="Sample.Database.Pool.enable">
-          <description txt="Active at runtime"/>
-          <spec txt="Sample Database Pool" id="Sample.Database.Pool.enable.field"
-                true="true" false="false" set="true" />
-          <depends variable="J2EE.Features.enable"/>
-          <createForPack name="Sample Database Pool"/>
         </field>
     </panel>
     <panel order="6">

Modified: geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
(original)
+++ geronimo/branches/1.0/modules/installer-processing/src/java/org/apache/geronimo/installer/processing/ConfigInstaller.java
Fri Jan 20 18:32:10 2006
@@ -1,7 +1,19 @@
-/*
- * Apache 2.0 license
+/**
  *
-*/
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.geronimo.installer.processing;
 import org.apache.xerces.dom.TextImpl;
 import org.apache.xerces.parsers.DOMParser;

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/GeronimoConfigProcessor.java
Fri Jan 20 18:32:10 2006
@@ -1,7 +1,19 @@
-/*
- * Apache 2.0 license
+/**
  *
-*/
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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 com.izforge.izpack.panels;
 import com.izforge.izpack.installer.AutomatedInstallData;
 import com.izforge.izpack.util.Debug;
@@ -166,8 +178,7 @@
                 setEnableVar( idata, pack.name, fSel );
          }
          // fixup for jetty not selected to install
-         if( isJettySelected( idata ) == false && 
-                isTomcatSelected( idata ) == true ) {
+         if( isTomcatSelected( idata ) == true ) {
                 int packs[] = {
                    TOMCAT_PACK, 
                    TOMCAT_WELCOME_PACK,
@@ -175,13 +186,25 @@
                    TOMCAT_UDDI_PACK,
                    TOMCAT_SAMPLE_PACK,
                    TOMCAT_DAYTRADER };
+               debug( "-setInitialConfig() : tomcat is selected for install. ");
                 boolean fSel = false;
                 String packName = null;
-                for( int i = 0; i < packs.length; ++i ) {
-                   packName = getPackName( packs[ i ] );
-                   fSel = isPackSelected( idata, packName );
-                   setEnableVar( idata, packName, fSel );
+                if( isJettySelected( idata ) == false ) {
+                   debug( "-setInitialConfig() : jetty is not selected for install. ");
+                   for( int i = 0; i < packs.length; ++i ) {
+                      packName = getPackName( packs[ i ] );
+                      fSel = isPackSelected( idata, packName );
+                      setEnableVar( idata, packName, fSel );
+                   }
+                } else {
+                   debug( "-setInitialConfig() : jetty is selected for install. ");
+                   for( int i = 0; i < packs.length; ++i ) {
+                      packName = getPackName( packs[ i ] );
+                      setEnableVar( idata, packName, false );
+                   }
                 }
+         } else {
+            debug( "-setInitialConfig() : tomcat is not selected for install. ");
          }
 
          // end fixup

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/PasswordGroup.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2003 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2003 Jonathan Halliday
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ProcessingClient.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2003 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Processor.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2002 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleInputField.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2002 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/RuleTextField.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2002 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelections.java
Fri Jan 20 18:32:10 2006
@@ -1,29 +1,25 @@
-/*
-Apache 2.0 license
-Geronimo
-
-IzPack Panel extension for Geronimo installer
-  Adapted from...
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+/**
  *
- * http://www.izforge.com/izpack/
- * http://developer.berlios.de/projects/izpack/
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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
  *
- * Copyright 2003 Jonathan Halliday
- * Copyright 2002 Elmar Grom
- * 
- * Licensed 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.
-*/
+ *
+ *  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.
+ */
+/*
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
+ * http://www.izforge.com/izpack/
+ * http://developer.berlios.de/projects/izpack/
+ */ 
 package com.izforge.izpack.panels;
 import com.izforge.izpack.Pack;
 import com.izforge.izpack.util.Debug;
@@ -3079,6 +3075,7 @@
   }
 
   public void setValidStates( boolean fDirectlyFromEvent ) {
+     setToVariableValue( idata );
      boolean isSelected = isSelected();
      if( reverseDepsSelected() == false ) {
         setDesiredState( false ); 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/ValidatePackSelectionsAutomationHelper.java
Fri Jan 20 18:32:10 2006
@@ -1,25 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * modified for Geronimo....  Based on....
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2003 Jonathan Halliday
- * Copyright 2002 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 

Modified: geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java?rev=370961&r1=370960&r2=370961&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
(original)
+++ geronimo/branches/1.0/modules/installer-support/src/java/com/izforge/izpack/panels/Validator.java
Fri Jan 20 18:32:10 2006
@@ -1,23 +1,25 @@
+/**
+ *
+ * Copyright 2003-2006 The Apache Software Foundation
+ *
+ *  Licensed 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.
+ */
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
- * 
+ * This module was adapted from IzPack work done by Julien Ponge
+ * and Elmar Grom.
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
- * 
- * Copyright 2002 Elmar Grom
- * 
- * Licensed 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 com.izforge.izpack.panels;
 



Mime
View raw message