[jboss-svn-commits] JBL Code SVN: r35404 - in labs/jbossrules/trunk/drools-guvnor: src/main and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 4 09:40:08 EDT 2010
Author: ge0ffrey
Date: 2010-10-04 09:40:07 -0400 (Mon, 04 Oct 2010)
New Revision: 35404
Added:
labs/jbossrules/trunk/drools-guvnor/src/main/filtered-webapp/
labs/jbossrules/trunk/drools-guvnor/src/main/filtered-webapp/AboutInfo.html
Removed:
labs/jbossrules/trunk/drools-guvnor/revision-number.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
Modified:
labs/jbossrules/trunk/drools-guvnor/pom.xml
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationTree.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_fr_FR.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_pt_BR.properties
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties
Log:
JBRULES-2720 Guvnor: In the about dialog the version and revision should be automatically up to date or removed. Make the version up to date and remove the revision.
+remove ANT script and version.txt
+ the ":" should not be in the message of WebDAVURL
+ AdministrationPanel is dead code
Modified: labs/jbossrules/trunk/drools-guvnor/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/pom.xml 2010-10-04 13:40:07 UTC (rev 35404)
@@ -34,27 +34,6 @@
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <!--
- <tasks>
- <ant antfile="${basedir}/revision-number.xml" target="find_revision">
- <property name="project.version" value="${project.version}"/>
- </ant>
- </tasks>
- -->
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
<inherited>false</inherited>
<executions>
<execution>
@@ -72,6 +51,21 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>${basedir}/src/main/webapp</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/filtered-webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -89,20 +83,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>generate-sources</id>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <ant antfile="${basedir}/revision-number.xml" target="find_revision">
- <property name="project.version" value="${project.version}"/>
- </ant>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
<id>soa_overlay</id>
<phase>package</phase>
<configuration>
@@ -119,6 +99,17 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources><!-- TODO verify that it's needed to repeat this from the normal war configuration -->
+ <resource>
+ <directory>${basedir}/src/main/webapp</directory>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/main/filtered-webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
<executions>
<execution>
<id>war-it</id>
Deleted: labs/jbossrules/trunk/drools-guvnor/revision-number.xml
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/revision-number.xml 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/revision-number.xml 2010-10-04 13:40:07 UTC (rev 35404)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project name="Drools" basedir="." default="find_revision">
- <property name="buildNumber" value="test"/>
- <property name="timestamp" value="timestamp"/>
-
- <target name="find_revision" description="Sets property 'revision.number' to the head svn revision">
-
- <property name="project.version" value="${project.version}"/>
-
- <exec executable="svnversion" outputproperty="svnlog.out" failifexecutionfails="false" >
- </exec>
-
- <condition property="svnversionDoesNotWork">
- <contains string="${svnlog.out}" substring="This client is too old" casesensitive="false" />
- </condition>
-
- <antcall target="write-version-and-build-number"/>
- <antcall target="write-version"/>
-
- </target>
-
- <!-- If svnversion works add the version and the build number -->
- <target name="write-version-and-build-number" unless="svnversionDoesNotWork">
- <touch file="./target/classes/org/drools/guvnor/public/version.txt" mkdirs="true"/>
- <echo file="./target/classes/org/drools/guvnor/public/version.txt">${project.version} ${svnlog.out}</echo>
- </target>
-
- <!-- If svnversion does not work just add the version -->
- <target name="write-version" if="svnversionDoesNotWork">
- <touch file="./target/classes/org/drools/guvnor/public/version.txt" mkdirs="true"/>
- <echo file="./target/classes/org/drools/guvnor/public/version.txt">${project.version}</echo>
- </target>
-
-</project>
Added: labs/jbossrules/trunk/drools-guvnor/src/main/filtered-webapp/AboutInfo.html
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/filtered-webapp/AboutInfo.html (rev 0)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/filtered-webapp/AboutInfo.html 2010-10-04 13:40:07 UTC (rev 35404)
@@ -0,0 +1,6 @@
+<html>
+ <body>
+ <p>Version ${pom.version}</p>
+ <p>© ${pom.inceptionYear} <a href="${pom.organization.url}">${pom.organization.name}</a></p>
+ </body>
+</html>
Deleted: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationPanel.java 2010-10-04 13:40:07 UTC (rev 35404)
@@ -1,128 +0,0 @@
-/**
- * Copyright 2010 JBoss Inc
- *
- * 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.drools.guvnor.client.explorer;
-
-import org.drools.guvnor.client.admin.ArchivedAssetManager;
-import org.drools.guvnor.client.admin.BackupManager;
-import org.drools.guvnor.client.admin.CategoryManager;
-import org.drools.guvnor.client.admin.LogViewer;
-import org.drools.guvnor.client.admin.PermissionViewer;
-import org.drools.guvnor.client.admin.RepoConfigManager;
-import org.drools.guvnor.client.admin.StateManager;
-import org.drools.guvnor.client.common.FormStylePopup;
-import org.drools.guvnor.client.common.SmallLabel;
-import org.drools.guvnor.client.messages.Constants;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.Frame;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.gwtext.client.core.EventObject;
-import com.gwtext.client.widgets.tree.TreeNode;
-import com.gwtext.client.widgets.tree.TreePanel;
-import com.gwtext.client.widgets.tree.event.TreePanelListenerAdapter;
-import org.drools.guvnor.client.admin.RuleVerifierManager;
-
-/**
- * @author Anton Arhipov
- */
-public class AdministrationPanel extends GenericPanel {
- private static Constants constants = GWT.create( Constants.class );
-
- public AdministrationPanel(ExplorerViewCenterPanel tabbedPanel) {
- super( constants.Administration(),
- tabbedPanel );
- setIconCls( "nav-admin" ); //NON-NLS
-
- TreePanel adminTree = basicTreeStructure( /*ExplorerNodeConfig
- .getAdminStructure()*/new TreeNode(),
- new TreePanelListenerAdapter() {
- public void onClick(TreeNode self,
- EventObject e) {
-
- int id = Integer.parseInt( self.getAttribute( "id" ) );
- switch ( id ) {
- case 0 :
- if ( !centertabbedPanel.showIfOpen( "catman" ) ) //NON-NLS
- centertabbedPanel.addTab( constants.CategoryManager(),
- new CategoryManager(),
- "catman" ); //NON-NLS
- break;
- case 1 :
- if ( !centertabbedPanel.showIfOpen( "archman" ) ) //NON-NLS
- centertabbedPanel.addTab( constants.ArchivedManager(),
- new ArchivedAssetManager( centertabbedPanel ),
- "archman" ); //NON-NLS
- break;
-
- case 2 :
- if ( !centertabbedPanel.showIfOpen( "stateman" ) ) //NON-NLS
- centertabbedPanel.addTab( constants.StateManager(),
- new StateManager(),
- "stateman" );
- break;
- case 3 :
- if ( !centertabbedPanel.showIfOpen( "bakman" ) ) centertabbedPanel.addTab( constants.ImportExport(),
- new BackupManager(),
- "bakman" );
- break;
-
- case 4 :
- if ( !centertabbedPanel.showIfOpen( "errorLog" ) ) centertabbedPanel.addTab( constants.EventLog(),
- new LogViewer(),
- "errorLog" );
- break;
- case 5 :
- if ( !centertabbedPanel.showIfOpen( "securityPermissions" ) ) centertabbedPanel.addTab( constants.UserPermissionMappings(),
- new PermissionViewer(),
- "securityPermissions" );
- break;
- case 6 :
- Frame aboutFrame = new Frame( "version.txt" ); //NON-NLS
-
- FormStylePopup aboutPop = new FormStylePopup();
- aboutPop.setWidth( 600 + "px" );
- aboutPop.setTitle( constants.About() );
- String hhurl = GWT.getModuleBaseURL() + "webdav";
- aboutPop.addAttribute( constants.WebDAVURL(),
- new SmallLabel( "<b>" + hhurl + "</b>" ) );
- aboutPop.addAttribute( constants.Version() + ":",
- aboutFrame );
- aboutPop.show();
- break;
- case 7 :
- if ( !centertabbedPanel.showIfOpen( "ruleVerifierManager" ) ) centertabbedPanel.addTab( constants.RulesVerificationManager(),
- new RuleVerifierManager(),
- "ruleVerifierManager" );
- break;
- case 8 :
- if ( !centertabbedPanel.showIfOpen( "repoconfig" ) ) //NON-NLS
- centertabbedPanel.addTab( constants.RepositoryConfig(),
- new RepoConfigManager(),
- "repoconfig" );
- break;
- }
- }
- } );
- adminTree.setRootVisible( false );
-
- VerticalPanel adminPanel = new VerticalPanel();
- adminPanel.add( adminTree );
- adminPanel.setWidth( "100%" );
- add( adminPanel );
- }
-
-}
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationTree.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationTree.java 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/AdministrationTree.java 2010-10-04 13:40:07 UTC (rev 35404)
@@ -95,16 +95,16 @@
"securityPermissions" );
break;
case 6 :
- Frame aboutFrame = new Frame( "version.txt" ); //NON-NLS
+ Frame aboutInfoFrame = new Frame( "../AboutInfo.html" ); //NON-NLS
FormStylePopup aboutPop = new FormStylePopup();
aboutPop.setWidth( 600 + "px" );
aboutPop.setTitle( constants.About() );
String hhurl = GWT.getModuleBaseURL() + "webdav";
- aboutPop.addAttribute( constants.WebDAVURL(),
+ aboutPop.addAttribute( constants.WebDAVURL() + ":",
new SmallLabel( "<b>" + hhurl + "</b>" ) );
aboutPop.addAttribute( constants.Version() + ":",
- aboutFrame );
+ aboutInfoFrame );
aboutPop.show();
break;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants.properties 2010-10-04 13:40:07 UTC (rev 35404)
@@ -1,5 +1,5 @@
ActionColumnConfigurationInsertingANewFact=Action column configuration (inserting a new fact)
-CantRemoveThisBlockAsOneOfTheNamesIsBeingUsed=Can't remove this block as one of the names is being used.
+CantRemoveThisBlockAsOneOfTheNamesIsBeingUsed=Can't remove this block as one of the names is being used.
ChooseAPatternThatThisColumnAddsDataTo=Choose a pattern that this column adds data to
Pattern=Pattern:
Assets=Assets
@@ -73,7 +73,7 @@
EventLog=Event Log
UserPermissionMappings=User Permission mappings
About=About
-WebDAVURL=WebDAV URL:
+WebDAVURL=WebDAV URL
Version=Version
Errors=Errors
Warnings=Warnings
@@ -1055,6 +1055,6 @@
SaveRepo=Save Configuration
SaveTheRepositoryConfig=Save the configuration?
SaveRepoInfo=Save the repository configuration to a file. Alternatively you can cut/paste it from this page. Don't forget to back up your repository (Import/Export) before replacing your existing repository.xml and restart your server for changes to take effect.
-Inbox=Inbox
+Inbox=Inbox
GlobalArea=Global Area
-InvalidDateFormatMessage=Date format is invalid. Please follow the correct date format: dd-MMM-yyyy
\ No newline at end of file
+InvalidDateFormatMessage=Date format is invalid. Please follow the correct date format: dd-MMM-yyyy
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_es_ES.properties 2010-10-04 13:40:07 UTC (rev 35404)
@@ -75,7 +75,7 @@
EventLog=Log de Eventos
UserPermissionMappings=Mapeo de Permisos de Usuario
About=Acerca
-WebDAVURL=WebDAV URL:
+WebDAVURL=WebDAV URL
Version=Versi\u00F3n
Errors=Errores
Warnings=Advertencias
@@ -932,4 +932,4 @@
AllChangesHaveBeenSaved=Todos los cambios han sido guardados
TemplateEditor=Edici\u00F3n del Template
TemplateData=Datos del Template
-LoadTemplateData=Carga Datos del Template
\ No newline at end of file
+LoadTemplateData=Carga Datos del Template
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_fr_FR.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_fr_FR.properties 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_fr_FR.properties 2010-10-04 13:40:07 UTC (rev 35404)
@@ -72,7 +72,7 @@
EventLog=Journal d'évènement
UserPermissionMappings=Autorisations
About=A propos
-WebDAVURL=URL WebDAV:
+WebDAVURL=URL WebDAV
Version=Version
Errors=Erreurs
Warnings=Avertissements
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_ja_JP.properties 2010-10-04 13:40:07 UTC (rev 35404)
@@ -72,7 +72,7 @@
EventLog=イベントログ
UserPermissionMappings=ユーザー権限マッピング
About=このアプリケーションについて
-WebDAVURL=WebDAV URL:
+WebDAVURL=WebDAV URL
Version=バージョン
Errors=エラー
Warnings=警告
@@ -920,4 +920,4 @@
IncomingChanges=Incoming changes
From=From
URLDocumentionDescription=この URL を使ってパッケージドキュメントの PDF をダウンロードしてください.
-URLForDocumention=パッケージドキュメントのURL:
\ No newline at end of file
+URLForDocumention=パッケージドキュメントのURL:
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_pt_BR.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_pt_BR.properties 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_pt_BR.properties 2010-10-04 13:40:07 UTC (rev 35404)
@@ -72,7 +72,7 @@
EventLog=Log de evento
UserPermissionMappings=Permiss\u00E3o de mapeamentos de usu\u00E1rio
About=Sobre
-WebDAVURL=WebDAV URL:
+WebDAVURL=WebDAV URL
Version=Vers\u00E3o
Errors=Erros
Warnings=Avisos
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/messages/Constants_zh_CN.properties 2010-10-04 13:40:07 UTC (rev 35404)
@@ -72,7 +72,7 @@
EventLog=事件日志
UserPermissionMappings=用户权限映射
About=关于
-WebDAVURL=WebDAV URL:
+WebDAVURL=WebDAV URL
Version=版本
Errors=错误
Warnings=警告
@@ -883,4 +883,4 @@
SavedOK=成功保存
Actions=动作...
ChangeSet=Change Set:
-URLToChangeSetForDeploymentAgents=URL to change set for deployment agents.
\ No newline at end of file
+URLToChangeSetForDeploymentAgents=URL to change set for deployment agents.
Deleted: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2010-10-04 13:19:09 UTC (rev 35403)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/public/version.txt 2010-10-04 13:40:07 UTC (rev 35404)
@@ -1 +0,0 @@
-5.0.0.SNAPSHOT 25673M
\ No newline at end of file
More information about the jboss-svn-commits
mailing list