Menu
▾
▴
giews-commit — SVN commit notices
You can subscribe to this list here.
| 2008 |
Jan
(111) |
Feb
(479) |
Mar
(301) |
Apr
(428) |
May
(475) |
Jun
(420) |
Jul
(323) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|
|
From: <sal...@us...> - 2008-07-15 14:05:19
|
Revision: 4616
http://giews.svn.sourceforge.net/giews/?rev=4616&view=rev
Author: salvatore_contu
Date: 2008-07-15 07:05:26 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
changed scripts according to fenix-parent
Modified Paths:
--------------
trunk/fenix-web/Fenix-GNU-Linux-run.launch
trunk/fenix-web/Fenix-Linux-Compile.launch
Modified: trunk/fenix-web/Fenix-GNU-Linux-run.launch
===================================================================
--- trunk/fenix-web/Fenix-GNU-Linux-run.launch 2008-07-15 14:05:00 UTC (rev 4615)
+++ trunk/fenix-web/Fenix-GNU-Linux-run.launch 2008-07-15 14:05:26 UTC (rev 4616)
@@ -12,9 +12,9 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web/target/fenix-web-0.0.8/WEB-INF/lib/mygwt-0.4.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/mygwt-0.4.1.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linux/gwt-dev-linux.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web/target/fenix-web-0.0.8/WEB-INF/lib/gwt-user-1.4.60.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linux/gwt-user.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
Modified: trunk/fenix-web/Fenix-Linux-Compile.launch
===================================================================
--- trunk/fenix-web/Fenix-Linux-Compile.launch 2008-07-15 14:05:00 UTC (rev 4615)
+++ trunk/fenix-web/Fenix-Linux-Compile.launch 2008-07-15 14:05:26 UTC (rev 4616)
@@ -12,9 +12,9 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web/target/fenix-web-0.0.8/WEB-INF/lib/mygwt-0.4.1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web/target/fenix-web-0.0.8/WEB-INF/lib/gwt-user-1.4.60.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/gwt-dev-linux-0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/mygwt-0.4.1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linux/gwt-user.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linux/gwt-dev-linux.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 14:04:54
|
Revision: 4615
http://giews.svn.sourceforge.net/giews/?rev=4615&view=rev
Author: erikvaningen
Date: 2008-07-15 07:05:00 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
re adding packing war to pom
Modified Paths:
--------------
trunk/fenix-web/pom.xml
Modified: trunk/fenix-web/pom.xml
===================================================================
--- trunk/fenix-web/pom.xml 2008-07-15 13:48:40 UTC (rev 4614)
+++ trunk/fenix-web/pom.xml 2008-07-15 14:05:00 UTC (rev 4615)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.fao.fenix</groupId>
<artifactId>fenix-parent</artifactId>
@@ -10,7 +11,7 @@
<name>fenix-web</name>
<artifactId>fenix-web</artifactId>
<version>${fenix.version}</version>
- <modelVersion>4.0.0</modelVersion>
+ <packaging>war</packaging>
<scm>
<connection>scm:svn:https://giews.svn.sourceforge.net/svnroot/giews/trunk/fenix-web</connection>
<developerConnection> scm:svn:https://giews.svn.sourceforge.net/svnroot/giews/trunk/fenix-web </developerConnection>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sal...@us...> - 2008-07-15 13:48:32
|
Revision: 4614
http://giews.svn.sourceforge.net/giews/?rev=4614&view=rev
Author: salvatore_contu
Date: 2008-07-15 06:48:40 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/fenix-gwt-dev/mygwt-0.4.1.jar
Added: trunk/fenix-gwt-dev/mygwt-0.4.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/mygwt-0.4.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sal...@us...> - 2008-07-15 13:32:20
|
Revision: 4613
http://giews.svn.sourceforge.net/giews/?rev=4613&view=rev
Author: salvatore_contu
Date: 2008-07-15 06:32:29 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
deleted old stuff
Removed Paths:
-------------
trunk/fenix-gwt-dev/gwt-dev-linux-0.jar
trunk/fenix-gwt-dev/gwt-dev-mac-0.jar
Deleted: trunk/fenix-gwt-dev/gwt-dev-linux-0.jar
===================================================================
(Binary files differ)
Deleted: trunk/fenix-gwt-dev/gwt-dev-mac-0.jar
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ta...@us...> - 2008-07-15 12:27:22
|
Revision: 4612
http://giews.svn.sourceforge.net/giews/?rev=4612&view=rev
Author: tanzila
Date: 2008-07-15 05:27:31 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
All Lang Classes extend FenixLang, to avoid the repetition of labels
Modified Paths:
--------------
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/fpi/client/view/lang/FPILang.java
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.java
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.properties
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang_it.properties
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.java
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.properties
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/text/client/view/lang/TextLang.java
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/fpi/client/view/lang/FPILang.java
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/fpi/client/view/lang/FPILang.java 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/fpi/client/view/lang/FPILang.java 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,8 +1,8 @@
package org.fao.fenix.web.modules.fpi.client.view.lang;
-import com.google.gwt.i18n.client.ConstantsWithLookup;
+import org.fao.fenix.web.modules.core.client.view.lang.FenixLang;
-public interface FPILang extends ConstantsWithLookup {
+public interface FPILang extends FenixLang {
public String gaulCodeSelector();
public String gaulLastSelection();
@@ -81,5 +81,6 @@
public String indexTableHeader2();
public String indexTableHeader3();
public String indexTableHeader4();
+
}
\ No newline at end of file
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.java
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.java 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.java 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,18 +1,13 @@
package org.fao.fenix.web.modules.re.client.view.lang;
-import com.google.gwt.i18n.client.ConstantsWithLookup;
+import org.fao.fenix.web.modules.core.client.view.lang.FenixLang;
-public interface RELang extends ConstantsWithLookup {
-
+public interface RELang extends FenixLang {
public String resourceExplorerWindowHeader();
public String catalogue();
public String search();
- public String open();
- public String cancel();
- public String stop();
public String searchFor();
- public String clear();
public String projects();
public String dataViews();
public String reports();
@@ -33,22 +28,8 @@
public String undo();
public String delete();
public String fields();
- public String title();
- public String type();
- public String category();
- public String dateModified();
- public String catalogueName();
- public String catalogueType();
- public String catalogueCategory();
- public String catalogueDateModified();
- public String catalogueId();
- public String catalogueRegion();
- public String keyword();
public String runQuickSearch();
- public String name();
- public String region();
public String findOnMap();
- public String categories();
public String noneSelected();
public String selectCategories();
public String lookIn();
@@ -60,62 +41,17 @@
public String advancedOptions();
public String selectAdvancedOptions();
public String sortColumn();
- public String cut();
- public String copy();
- public String paste();
- public String rename();
- public String metadataEditor();
- public String metadata();
- public String viewMetadata();
- public String editMetadata();
- public String saveMetadata();
- public String undoChanges();
- public String commaSeparatedKeywords();
- public String formatDate();
- public String linkedResources();
- public String metadataId();
- public String metadataTitle();
- public String metadataAbstract();
- public String metadataKeywords();
- public String metadataProvider();
- public String metadataSource();
- public String metadataContact();
- public String metadataRegion();
- public String metadataStartDate();
- public String metadataEndDate();
- public String metadataDateLastUpdate();
- public String metadataPeriodTypeCode();
- public String metadataSharingCode();
- public String metadataClickToEdit();
- public String metadataCategories();
public String duplicate();
public String openAsChart();
public String openAsMap();
public String openAsTable();
public String openAs();
- public String chart();
- public String table();
- public String map();
public String vectorLayer();
public String rasterLayer();
public String layerType();
- public String addResourceToProject();
- public String add();
- public String close();
+ public String addResourceToProject();
public String layers();
- public String pmAddProject();
- public String pmRemoveProject();
- public String pmAddResourceToProject();
- public String pmRemoveResourceFromProject();
- public String pmNewProject();
- public String pmDeleteProject();
- public String pmRenameProject();
- public String renameResource();
- public String pmSaveProject();
- public String untitled();
public String update();
- public String newProject();
- public String featureNotAvailableYet();
public String selectPeer();
public String refresh();
public String hostLabel();
@@ -126,31 +62,15 @@
public String reportURL();
public String toolbox();
public String loadOrCreateNew();
- public String addResource();
- public String removeResource();
- public String save();
- public String createProject();
public String loadProject();
public String removeFromProject();
public String copyTo();
- public String loadResourceExplorer();
- public String loadOrCreateNewResources();
public String start();
public String end();
public String next();
public String previous();
- public String nu();
- public String abstractAbstract();
- public String keywords();
- public String provider();
- public String source();
- public String contact();
- public String startDate();
- public String endDate();
- public String dateLastUpdate();
- public String periodTypeCode();
- public String sharingCode();
- public String currency();
- public String measurementOfUnit();
- public String precision();
+ public String chart();
+ public String table();
+ public String map();
+
}
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.properties
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.properties 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang.properties 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,11 +1,7 @@
resourceExplorerWindowHeader = Resource Explorer
-search = Search
catalogue = Catalogue
-open Open
-cancel Cancel
-stop Stop
+search = Search
searchFor Search for
-clear Clear
projects = Projects
dataViews = Data Views
reports = Reports
@@ -26,22 +22,8 @@
undo = Undo
delete = Delete
fields = Fields
-title = Title
-type = Type
-category = Category
-dateModified = Date Modified
-catalogueName = TITLE
-catalogueType = TYPE
-catalogueCategory = CATEGORY
-catalogueDateModified = DATE MODIFIED
-catalogueId = ID
-catalogueRegion = REGION
-keyword = Keyword
runQuickSearch = Run quick search
-name = Name
-region = Region
findOnMap = Find on map
-categories = Categories
noneSelected = None selected
selectCategories = Select categories
lookIn = Look in
@@ -53,62 +35,17 @@
advancedOptions = Advanced options
selectAdvancedOptions = Select advanced options
sortColumn = Click on header to sort the column
-cut = Cut
-copy= Copy
-paste = Paste
-rename = Rename
-metadataEditor = Metadata Editor
-metadata = Metadata
-viewMetadata = View Metadata
-editMetadata = Edit Metadata
-saveMetadata = Save Metadata Updates
-undoChanges = Undo Changes
-commaSeparatedKeywords = Each keyword should be separated by a comma
-formatDate = Please enter the date using a <b>YYYY-MM-DD</b> format e.g. 2008-05-14
-linkedResources = Linked Resources
-metadataId = Id
-metadataTitle = Title
-metadataAbstract = Abstract
-metadataKeywords = Descriptive Keywords
-metadataCategories = Resource Category
-metadataProvider = Resource Provider
-metadataSource = Source
-metadataContact = Point of Contact
-metadataRegion = Region
-metadataStartDate Start Date
-metadataEndDate = End Date
-metadataDateLastUpdate = Date Last Modified
-metadataPeriodTypeCode = Periodicity of Data
-metadataSharingCode = Sharing Policy
-metadataClickToEdit = Click to edit
duplicate = Duplicate
openAsChart = Open as a Chart
openAsMap = Open as a Map
openAsTable = Open as a Table
openAs = Open as:
-rasterLayer = Raster Layer
vectorLayer = Vector Layer
-chart = Chart
-table = Table
-map = Maps
+rasterLayer = Raster Layer
layerType = Layer Type
addResourceToProject = Add resource to project
-add = Add
-close = Close
layers = Layers
-pmAddProject = Add Project
-pmRemoveProject = Remove Project
-pmAddResourceToProject = Add Resource To Project
-pmRemoveResourceFromProject = Remove Resource From Project
-pmNewProject = New Project
-pmDeleteProject = Delete Project
-pmRenameProject = Rename Project
-pmSaveProject = Save Project
-untitled = Untitled
update = Update
-newProject = NEW PROJECT
-featureNotAvailableYet = *** FEATURE NOT AVAILABLE YET ***
-renameResource = Rename Resource
selectPeer = Select Peer
refresh = Refresh
hostLabel = HOST
@@ -119,30 +56,13 @@
reportURL = URL Report
toolbox = Toolbox
loadOrCreateNew = Load or Create New
-addResource = Add Resource
-removeResource = Remove From Project Manager
-save = Save
-createProject = Create New Project
loadProject= Load Project
removeFromProject = Remove From Project
copyTo = Copy to ..
-loadResourceExplorer = Load Resource Explorer
-loadOrCreateNewResources = Load or Create New Resources
start = |<
end = >|
next = >
previous = <
-nu = New
-abstractAbstract = Abstract
-keywords = Keywords
-provider = Resource Provider
-source = Source
-contact = Point of Contact
-startDate Start Date
-endDate = End Date
-dateLastUpdate = Date Last Modified
-periodTypeCode = Periodicity of Data
-sharingCode = Sharing Policy
-currency = Currency
-measurementOfUnit = Measurement Unit
-precision = Precision
+chart = Chart
+table = Table
+map = Maps
\ No newline at end of file
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang_it.properties
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang_it.properties 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/re/client/view/lang/RELang_it.properties 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,17 +1,13 @@
resourceExplorerWindowHeader = Esplora Risorse
-search = Cerca
catalogue = Catalogo
-open Apri
-cancel Annulla
-stop Ferma
-searchFor Cerca
-clear Clear
+search = Cerca
+searchFor = Cerca
projects = Progetti
dataViews = Viste Dati
reports = Relazioni
text = Testi
-mapLayers Layers Mappe
-datasets Datasets
+mapLayers = Layers Mappe
+datasets = Datasets
searchMyProjects = Cerca nei Miei Progetti
pagerStart = Torna alla prima pagina
pagerBack = Pagina precedente
@@ -26,21 +22,8 @@
undo = Annulla l'ultima operazione
delete = Elimina
fields = Campi
-title = Titolo
-type = Tipo
-category = Categoria
-dateModified = Data Modifica
-catalogueName = NOME
-catalogueType = TIPO
-catalogueCategory = CATEGORIA
-catalogueDateModified = DATA ULTIMA MODIFICA
-catalogueId = ID
-keyword = Parola chiave
runQuickSearch = Ricerca veloce
-name = Titolo
-region = Regione
findOnMap = Trova sulla mappa
-categories = Categorie
noneSelected = Nessuna selezione
selectCategories = Seleziona categorie
lookIn = Cerca in
@@ -52,10 +35,4 @@
advancedOptions = Opzioni avanzate
selectAdvancedOptions = Seleziona opzioni avanzate
sortColumn = Click sul nome della colonna per ordinarla
-cut = Taglia
-copy= Copia
-paste = Incolla
-rename = Rinomina
-viewMetadata = Visualizza Metadato
-linkedResources = Risorse Collegate
duplicate = Duplicate
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.java
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.java 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.java 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,11 +1,9 @@
package org.fao.fenix.web.modules.shared.window.client.view.lang;
-import com.google.gwt.i18n.client.ConstantsWithLookup;
+import org.fao.fenix.web.modules.core.client.view.lang.FenixLang;
-public interface FenixToolbarLang extends ConstantsWithLookup {
+public interface FenixToolbarLang extends FenixLang {
- public String save();
- public String saveAs();
public String sendToProject();
public String sendToReport();
public String sendToPDF();
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.properties
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.properties 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/shared/window/client/view/lang/FenixToolbarLang.properties 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,5 +1,3 @@
-save = Save
-saveAs = Save as..
sendToProject = Send to project
sendToReport = Send to report
sendToPDF = Send to PDF
Modified: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/text/client/view/lang/TextLang.java
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/text/client/view/lang/TextLang.java 2008-07-15 12:26:35 UTC (rev 4611)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/text/client/view/lang/TextLang.java 2008-07-15 12:27:31 UTC (rev 4612)
@@ -1,9 +1,10 @@
package org.fao.fenix.web.modules.text.client.view.lang;
-import com.google.gwt.i18n.client.Constants;
+import org.fao.fenix.web.modules.core.client.view.lang.FenixLang;
- public interface TextLang extends Constants {
+ public interface TextLang extends FenixLang {
+
String backColors();
String black();
String blue();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ta...@us...> - 2008-07-15 12:26:25
|
Revision: 4611
http://giews.svn.sourceforge.net/giews/?rev=4611&view=rev
Author: tanzila
Date: 2008-07-15 05:26:35 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
New common language class FenixLang
Added Paths:
-----------
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.java
trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.properties
Added: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.java
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.java (rev 0)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.java 2008-07-15 12:26:35 UTC (rev 4611)
@@ -0,0 +1,32 @@
+package org.fao.fenix.web.modules.core.client.view.lang;
+
+import com.google.gwt.i18n.client.ConstantsWithLookup;
+
+public interface FenixLang extends ConstantsWithLookup {
+
+ public String open();
+ public String cancel();
+ public String stop();
+ public String clear();
+ public String title();
+ public String type();
+ public String category();
+ public String dateModified();
+ public String region();
+ public String keywords();
+ public String descriptiveKeywords();
+ public String add();
+ public String close();
+ public String save();
+ public String saveAs();
+ public String featureNotAvailableYet();
+ public String id();
+ public String cut();
+ public String copy();
+ public String paste();
+ public String rename();
+ public String metadataEditor();
+ public String metadata();
+ public String viewMetadata();
+ public String editMetadata();
+}
Property changes on: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.properties
===================================================================
--- trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.properties (rev 0)
+++ trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.properties 2008-07-15 12:26:35 UTC (rev 4611)
@@ -0,0 +1,25 @@
+open Open
+cancel Cancel
+stop Stop
+clear Clear
+title = Title
+type = Type
+category = Category
+dateModified = Date Modified
+region = Region
+keywords = Keywords
+descriptiveKeywords = Descriptive Keywords
+add = Add
+close = Close
+save = Save
+saveAs = Save As
+featureNotAvailableYet = *** FEATURE NOT AVAILABLE YET ***
+id = ID
+cut = Cut
+copy= Copy
+paste = Paste
+rename = Rename
+metadataEditor = Metadata Editor
+metadata = Metadata
+viewMetadata = View Metadata
+editMetadata = Edit Metadata
Property changes on: trunk/fenix-web-2/src/main/java/org/fao/fenix/web/modules/core/client/view/lang/FenixLang.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ta...@us...> - 2008-07-15 12:25:38
|
Revision: 4610
http://giews.svn.sourceforge.net/giews/?rev=4610&view=rev
Author: tanzila
Date: 2008-07-15 05:25:48 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Windows fixes
Modified Paths:
--------------
trunk/fenix-web-2/WINDOWS-Compile.launch
Modified: trunk/fenix-web-2/WINDOWS-Compile.launch
===================================================================
--- trunk/fenix-web-2/WINDOWS-Compile.launch 2008-07-15 12:25:21 UTC (rev 4609)
+++ trunk/fenix-web-2/WINDOWS-Compile.launch 2008-07-15 12:25:48 UTC (rev 4610)
@@ -13,13 +13,13 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web-2" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/src/main/java" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/ext-gwt-1.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-dev-windows-RC1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-user-RC1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windowsRC1/gwt-dev-windows.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windowsRC1/gwt-user.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTCompiler"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out src/main/webapp org.fao.fenix.web.modules.core.Fenix"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="fenix-web-2"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1000M"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-out src/main/webapp org.fao.fenix.web.Fenix"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="fenix-web-2"/>
</launchConfiguration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ta...@us...> - 2008-07-15 12:25:12
|
Revision: 4609
http://giews.svn.sourceforge.net/giews/?rev=4609&view=rev
Author: tanzila
Date: 2008-07-15 05:25:21 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Windows fixes
Modified Paths:
--------------
trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch
Modified: trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch
===================================================================
--- trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch 2008-07-15 12:22:05 UTC (rev 4608)
+++ trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch 2008-07-15 12:25:21 UTC (rev 4609)
@@ -13,12 +13,12 @@
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web-2" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/src/main/java" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/ext-gwt-1.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-dev-windows-RC1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-user-RC1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windowsRC1/gwt-dev-windows.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windowsRC1/gwt-user.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-port 8080 -noserver fenix-web-2/org.fao.fenix.web.Fenix/Fenix.html"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-port 8080 -noserver fenix-web-2/org.fao.fenix.web.modules.core.Fenix/Fenix.html"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1000M"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="fenix-web-2"/>
</launchConfiguration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ta...@us...> - 2008-07-15 12:21:59
|
Revision: 4608
http://giews.svn.sourceforge.net/giews/?rev=4608&view=rev
Author: tanzila
Date: 2008-07-15 05:22:05 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Fixes for Windows
Added Paths:
-----------
trunk/fenix-gwt-dev/windowsRC1/
trunk/fenix-gwt-dev/windowsRC1/applicationCreator.cmd
trunk/fenix-gwt-dev/windowsRC1/benchmarkViewer.cmd
trunk/fenix-gwt-dev/windowsRC1/gwt-benchmark-viewer.jar
trunk/fenix-gwt-dev/windowsRC1/gwt-dev-windows.jar
trunk/fenix-gwt-dev/windowsRC1/gwt-ll.dll
trunk/fenix-gwt-dev/windowsRC1/gwt-module.dtd
trunk/fenix-gwt-dev/windowsRC1/gwt-servlet.jar
trunk/fenix-gwt-dev/windowsRC1/gwt-user.jar
trunk/fenix-gwt-dev/windowsRC1/i18nCreator.cmd
trunk/fenix-gwt-dev/windowsRC1/junitCreator.cmd
trunk/fenix-gwt-dev/windowsRC1/projectCreator.cmd
trunk/fenix-gwt-dev/windowsRC1/swt-win32-3235.dll
Removed Paths:
-------------
trunk/fenix-gwt-dev/windows/gwt-user-RC1.jar
Deleted: trunk/fenix-gwt-dev/windows/gwt-user-RC1.jar
===================================================================
(Binary files differ)
Added: trunk/fenix-gwt-dev/windowsRC1/applicationCreator.cmd
===================================================================
--- trunk/fenix-gwt-dev/windowsRC1/applicationCreator.cmd (rev 0)
+++ trunk/fenix-gwt-dev/windowsRC1/applicationCreator.cmd 2008-07-15 12:22:05 UTC (rev 4608)
@@ -0,0 +1 @@
+@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.user.tools.ApplicationCreator %*
Added: trunk/fenix-gwt-dev/windowsRC1/benchmarkViewer.cmd
===================================================================
--- trunk/fenix-gwt-dev/windowsRC1/benchmarkViewer.cmd (rev 0)
+++ trunk/fenix-gwt-dev/windowsRC1/benchmarkViewer.cmd 2008-07-15 12:22:05 UTC (rev 4608)
@@ -0,0 +1 @@
+@java -Dcom.google.gwt.junit.reportPath="%1" -cp "%~dp0/gwt-user.jar;%~dp0/gwt-dev-windows.jar;%~dp0/gwt-benchmark-viewer.jar" com.google.gwt.dev.GWTShell -port auto com.google.gwt.benchmarks.viewer.ReportViewer/ReportViewer.html?gwt.hybrid;
Added: trunk/fenix-gwt-dev/windowsRC1/gwt-benchmark-viewer.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windowsRC1/gwt-benchmark-viewer.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/fenix-gwt-dev/windowsRC1/gwt-dev-windows.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windowsRC1/gwt-dev-windows.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/fenix-gwt-dev/windowsRC1/gwt-ll.dll
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windowsRC1/gwt-ll.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/fenix-gwt-dev/windowsRC1/gwt-module.dtd
===================================================================
--- trunk/fenix-gwt-dev/windowsRC1/gwt-module.dtd (rev 0)
+++ trunk/fenix-gwt-dev/windowsRC1/gwt-module.dtd 2008-07-15 12:22:05 UTC (rev 4608)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- -->
+<!-- Copyright 2007 Google 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 -->
+<!-- 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. License for the specific language governing permissions and -->
+<!-- limitations under the License. -->
+
+<!-- The module root element -->
+<!ELEMENT module (inherits | source | public | super-source | entry-point |
+ stylesheet | script | servlet | replace-with | generate-with |
+ define-property | extend-property | set-property | property-provider |
+ define-linker | add-linker)*>
+<!ATTLIST module
+ rename-to CDATA #IMPLIED
+>
+<!-- Inherit the contents of another module -->
+<!ELEMENT inherits EMPTY>
+<!ATTLIST inherits
+ name CDATA #REQUIRED
+>
+<!-- Specify the source path, relative to the classpath location of the module descriptor -->
+<!ELEMENT source (include | exclude)*>
+<!ATTLIST source
+ path CDATA #REQUIRED
+ includes CDATA #IMPLIED
+ excludes CDATA #IMPLIED
+ defaultexclude (yes | no) "yes"
+ casesensitive (true | false) "true"
+>
+<!-- Specify the public resource path, relative to the classpath location of the module descriptor -->
+<!ELEMENT public (include | exclude)*>
+<!ATTLIST public
+ path CDATA #REQUIRED
+ includes CDATA #IMPLIED
+ excludes CDATA #IMPLIED
+ defaultexclude (yes | no) "yes"
+ casesensitive (true | false) "true"
+>
+<!-- Specify a source path that rebases subpackages into the root namespace -->
+<!ELEMENT super-source (include | exclude)*>
+<!ATTLIST super-source
+ path CDATA #REQUIRED
+ includes CDATA #IMPLIED
+ excludes CDATA #IMPLIED
+ defaultexclude (yes | no) "yes"
+ casesensitive (true | false) "true"
+>
+<!ELEMENT include EMPTY>
+<!ATTLIST include
+ name CDATA #REQUIRED
+>
+<!ELEMENT exclude EMPTY>
+<!ATTLIST exclude
+ name CDATA #REQUIRED
+>
+
+<!-- Define a module entry point -->
+<!ELEMENT entry-point EMPTY>
+<!ATTLIST entry-point
+ class CDATA #REQUIRED
+>
+
+<!-- Preload a stylesheet before executing the GWT application -->
+<!ELEMENT stylesheet EMPTY>
+<!ATTLIST stylesheet
+ src CDATA #REQUIRED
+>
+<!-- Preload an external JavaScript file before executing the GWT application -->
+<!ELEMENT script (#PCDATA)>
+<!ATTLIST script
+ src CDATA #REQUIRED
+>
+<!-- Map a named servlet class to a module-relative path in hosted mode -->
+<!ELEMENT servlet EMPTY>
+<!ATTLIST servlet
+ path CDATA #REQUIRED
+ class CDATA #REQUIRED
+>
+
+<!-- Adds a Linker to the compilation process -->
+<!ELEMENT add-linker EMPTY>
+<!-- A comma-separated list of linker names -->
+<!ATTLIST add-linker
+ name CDATA #REQUIRED
+>
+
+<!-- Defines a Linker type to package compiler output -->
+<!ELEMENT define-linker EMPTY>
+<!ATTLIST define-linker
+ class CDATA #REQUIRED
+ name CDATA #REQUIRED
+>
+
+<!-- ^^^ Commonly-used elements ^^^ -->
+<!-- VVV Deferred binding elements VVV -->
+
+<!-- Define a property and allowable values (comma-separated identifiers) -->
+<!ELEMENT define-property EMPTY>
+<!ATTLIST define-property
+ name CDATA #REQUIRED
+ values CDATA #REQUIRED
+>
+<!-- Set the value of a previously-defined property -->
+<!ELEMENT set-property EMPTY>
+<!ATTLIST set-property
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+<!-- Add additional allowable values to a property -->
+<!ELEMENT extend-property EMPTY>
+<!ATTLIST extend-property
+ name CDATA #REQUIRED
+ values CDATA #REQUIRED
+>
+<!-- Define a JavaScript fragment that will return the value for the named property at runtime -->
+<!ELEMENT property-provider (#PCDATA)>
+<!ATTLIST property-provider
+ name CDATA #REQUIRED
+>
+<!-- All possible predicates -->
+<!ENTITY % predicates "when-property-is | when-type-assignable | when-type-is | all | any | none">
+<!-- Deferred binding assignment to substitute a named class -->
+<!ELEMENT replace-with (%predicates;)*>
+<!ATTLIST replace-with
+ class CDATA #REQUIRED
+>
+<!-- Deferred binding assignment to substitute a generated class -->
+<!ELEMENT generate-with (%predicates;)*>
+<!ATTLIST generate-with
+ class CDATA #REQUIRED
+>
+<!-- Deferred binding predicate that is true when a named property has a given value-->
+<!ELEMENT when-property-is EMPTY>
+<!ATTLIST when-property-is
+ name CDATA #REQUIRED
+ value CDATA #REQUIRED
+>
+<!-- Deferred binding predicate that is true for types in the type system that are assignable to the specified type -->
+<!ELEMENT when-type-assignable EMPTY>
+<!ATTLIST when-type-assignable
+ class CDATA #REQUIRED
+>
+<!-- Deferred binding predicate that is true for exactly one type in the type system -->
+<!ELEMENT when-type-is EMPTY>
+<!ATTLIST when-type-is
+ class CDATA #REQUIRED
+>
+<!-- Predicate that ANDs all child conditions -->
+<!ELEMENT all (%predicates;)*>
+<!-- Predicate that ORs all child conditions -->
+<!ELEMENT any (%predicates;)*>
+<!-- Predicate that NANDs all child conditions -->
+<!ELEMENT none (%predicates;)*>
Property changes on: trunk/fenix-gwt-dev/windowsRC1/gwt-module.dtd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/fenix-gwt-dev/windowsRC1/gwt-servlet.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windowsRC1/gwt-servlet.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/fenix-gwt-dev/windowsRC1/gwt-user.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windowsRC1/gwt-user.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/fenix-gwt-dev/windowsRC1/i18nCreator.cmd
===================================================================
--- trunk/fenix-gwt-dev/windowsRC1/i18nCreator.cmd (rev 0)
+++ trunk/fenix-gwt-dev/windowsRC1/i18nCreator.cmd 2008-07-15 12:22:05 UTC (rev 4608)
@@ -0,0 +1 @@
+@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.i18n.tools.I18NCreator %*
Added: trunk/fenix-gwt-dev/windowsRC1/junitCreator.cmd
===================================================================
--- trunk/fenix-gwt-dev/windowsRC1/junitCreator.cmd (rev 0)
+++ trunk/fenix-gwt-dev/windowsRC1/junitCreator.cmd 2008-07-15 12:22:05 UTC (rev 4608)
@@ -0,0 +1 @@
+@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.junit.tools.JUnitCreator %*
Added: trunk/fenix-gwt-dev/windowsRC1/projectCreator.cmd
===================================================================
--- trunk/fenix-gwt-dev/windowsRC1/projectCreator.cmd (rev 0)
+++ trunk/fenix-gwt-dev/windowsRC1/projectCreator.cmd 2008-07-15 12:22:05 UTC (rev 4608)
@@ -0,0 +1 @@
+@java -cp "%~dp0\gwt-user.jar;%~dp0\gwt-dev-windows.jar" com.google.gwt.user.tools.ProjectCreator %*
Added: trunk/fenix-gwt-dev/windowsRC1/swt-win32-3235.dll
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windowsRC1/swt-win32-3235.dll
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 10:46:46
|
Revision: 4607
http://giews.svn.sourceforge.net/giews/?rev=4607&view=rev
Author: erikvaningen
Date: 2008-07-15 03:46:53 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
corrected adding dataset to project explorer
Modified Paths:
--------------
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java 2008-07-15 10:01:52 UTC (rev 4606)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/projectmanager/ProjectManager.java 2008-07-15 10:46:53 UTC (rev 4607)
@@ -80,7 +80,7 @@
// add tool-bar
window.getContent().add(new ProjectManagerToolbar().build());
-
+
// open window
window.setLocation(Window.getClientWidth() - 350, (int) (Window.getClientHeight() / 5));
window.open();
@@ -127,7 +127,8 @@
public void createUntitledTree() {
Tree tree = new Tree();
- FenixResource project = new FenixResource("untitled", Fenix.fenixLang.untitled(), Fenix.fenixLang.untitled(), "project", "");
+ FenixResource project = new FenixResource("untitled", Fenix.fenixLang.untitled(), Fenix.fenixLang.untitled(),
+ "project", "");
createProjectFolder(tree, project);
initiateTree(tree);
tree.expandAll();
@@ -169,8 +170,8 @@
if (Fenix.fenixLang == null)
Fenix.fenixLang = (FenixLang) GWT.create(FenixLang.class);
resourceTypeMap.put(Fenix.fenixLang.chart(), ResourceTypeNew.CHARTVIEW);
- resourceTypeMap.put(Fenix.fenixLang.datasets(), "dataset");
- resourceTypeMap.put(Fenix.fenixLang.layers(), "layer");
+ resourceTypeMap.put(Fenix.fenixLang.datasets(), ResourceTypeNew.DATASET);
+ resourceTypeMap.put(Fenix.fenixLang.layers(), ResourceTypeNew.LAYER);
resourceTypeMap.put(Fenix.fenixLang.map(), ResourceTypeNew.MAPVIEW);
resourceTypeMap.put(Fenix.fenixLang.reports(), ResourceTypeNew.REPORT);
resourceTypeMap.put(Fenix.fenixLang.table(), ResourceTypeNew.TABLEVIEW);
@@ -226,7 +227,7 @@
Fenix.newProjectManager.window.getContent().getLayout().layout(Fenix.newProjectManager.window.getContent());
}
}
-
+
public void removeResourceFromProject(FenixResource rsrc, String projectId) {
TreeItem item = Fenix.newProjectManager.selectedItem;
if (item != null) {
@@ -270,7 +271,7 @@
}
private void addTreeListener(final Tree tree) {
-
+
tree.addListener(Events.Click, new Listener() {
public void handleEvent(BaseEvent event) {
TreeItem item = (TreeItem) event.widget;
@@ -285,18 +286,18 @@
ProjectManagerOpener.open();
}
});
-
- //initialize the project manager context menu
- tree.setContextMenu(new ProjectManagerContextMenu().build(null));
-
- tree.addListener(Events.ContextMenu, new Listener() {
- public void handleEvent(BaseEvent event) {
- Tree t = (Tree) event.widget;
- TreeItem sel = t.getSelectedItem();
+
+ // initialize the project manager context menu
+ tree.setContextMenu(new ProjectManagerContextMenu().build(null));
+
+ tree.addListener(Events.ContextMenu, new Listener() {
+ public void handleEvent(BaseEvent event) {
+ Tree t = (Tree) event.widget;
+ TreeItem sel = t.getSelectedItem();
selectedItem = sel;
-
+
tree.setContextMenu(new ProjectManagerContextMenu().build(selectedItem));
-
+
}
});
}
@@ -312,7 +313,7 @@
map[2]++;
else if (((FenixResource) vector.get(i)).getType().equals(ResourceTypeNew.REPORT))
map[3]++;
- else if (((FenixResource) vector.get(i)).getType().equals("dataset"))
+ else if (((FenixResource) vector.get(i)).getType().equals(ResourceTypeNew.DATASET))
map[4]++;
else if (((FenixResource) vector.get(i)).getType().equals(ResourceTypeNew.TEXTVIEW))
map[5]++;
@@ -322,15 +323,13 @@
public void fillIconMap() {
iconMap.put(ResourceTypeNew.MAPVIEW, "pmMap");
- iconMap.put("MapView", "pmMap");
iconMap.put(ResourceTypeNew.CHARTVIEW, "pmChart");
iconMap.put(ResourceTypeNew.TABLEVIEW, "pmTable");
- iconMap.put("dataset", "pmDataset");
+ iconMap.put(ResourceTypeNew.DATASET, "pmDataset");
iconMap.put(ResourceTypeNew.REPORT, "pmReport");
iconMap.put(ResourceTypeNew.TEXTVIEW, "pmText");
- iconMap.put("layer", "pmLayer");
- iconMap.put("project", "tree-folder-open");
- iconMap.put("project", "tree-folder");
+ iconMap.put(ResourceTypeNew.LAYER, "pmLayer");
+ iconMap.put(ResourceTypeNew.PROJECT, "tree-folder-open");
}
public boolean untitledExists() {
@@ -343,6 +342,6 @@
return true;
}
return false;
- }
-
+ }
+
}
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java 2008-07-15 10:01:52 UTC (rev 4606)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/ResourceExplorer.java 2008-07-15 10:46:53 UTC (rev 4607)
@@ -43,6 +43,7 @@
import org.fao.fenix.web.client.re2.search.SearchMask;
import org.fao.fenix.web.client.re2.search.SearchPanelToolbar;
import org.fao.fenix.web.client.re2.search.SearchScope;
+import org.fao.fenix.web.client.util.FenixConstants;
import org.fao.fenix.web.client.util.ShellUtils;
import com.google.gwt.user.client.ui.Panel;
@@ -77,8 +78,8 @@
searchMask = new SearchMask();
catalogueList = new CatalogueList();
listPanel = new ContentPanel(Style.HEADER);
- caller = "";
- // resourceType = ResourceSearchType.PROJECT;
+ caller = FenixConstants.PROJECT_MANAGER;
+ resourceType = ResourceSearchType.PROJECT;
peer = "http://localhost:8080/fenix-services/services/CommunicationModuleService";
searchEvent = new SearchEvent();
fenixSearchParameters = new FenixSearchParameters();
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java 2008-07-15 10:01:52 UTC (rev 4606)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java 2008-07-15 10:46:53 UTC (rev 4607)
@@ -25,7 +25,6 @@
import org.fao.fenix.web.client.util.Loading;
import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.ListBox;
public class CatalogueContextMenu {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 10:01:44
|
Revision: 4606
http://giews.svn.sourceforge.net/giews/?rev=4606&view=rev
Author: erikvaningen
Date: 2008-07-15 03:01:52 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
fexiing adding dataset from new chart wizard
Modified Paths:
--------------
trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java
Modified: trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java
===================================================================
--- trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java 2008-07-15 09:25:36 UTC (rev 4605)
+++ trunk/fenix-web/src/main/java/org/fao/fenix/web/client/re2/catalogue/CatalogueContextMenu.java 2008-07-15 10:01:52 UTC (rev 4606)
@@ -41,14 +41,18 @@
private void removeResource() {
- final String resourceType = (String) Fenix.newResourceExplorer.catalogueList.table.getSelectedItem().getValues()[1];
- long resourceId = Long.valueOf((String) Fenix.newResourceExplorer.catalogueList.table.getSelectedItem().getValues()[5]).longValue();
+ final String resourceType = (String) Fenix.newResourceExplorer.catalogueList.table.getSelectedItem()
+ .getValues()[1];
+ long resourceId = Long.valueOf(
+ (String) Fenix.newResourceExplorer.catalogueList.table.getSelectedItem().getValues()[5]).longValue();
Fenix.reService.deleteResource(resourceId, resourceType, new AsyncCallback() {
public void onSuccess(Object result) {
ResourceExplorer.searchEvent.searchStart();
- // Fenix.newResourceExplorer.catalogueList.fill(resourceType, Fenix.newResourceExplorer.catalogueList.table, 1, FenixConstants.ITEMS_PER_PAGE);
+ // Fenix.newResourceExplorer.catalogueList.fill(resourceType,
+ // Fenix.newResourceExplorer.catalogueList.table, 1,
+ // FenixConstants.ITEMS_PER_PAGE);
}
public void onFailure(Throwable caught) {
@@ -60,7 +64,7 @@
public Menu build(String resourceType) {
- /* ***** OPEN ***** */
+ /* OPEN */
MenuItem open = new MenuItem(Style.PUSH);
open.setText(Fenix.fenixLang.open());
open.addSelectionListener(new SelectionListener() {
@@ -73,7 +77,7 @@
separator = new MenuItem(Style.SEPARATOR);
contextMenu.add(separator);
- /* ***** OPEN AS A CHART ***** */
+ /* OPEN AS A CHART */
MenuItem openAsChart = new MenuItem(Style.PUSH);
openAsChart.setText(Fenix.fenixLang.openAsChart());
openAsChart.addSelectionListener(new SelectionListener() {
@@ -86,7 +90,8 @@
if (((String) item.getValue(1)).equals(ResourceTypeNew.DATASET)) {
List chartList = new ArrayList();
- // chartList.add(CatalogueOpener.cleanTitle(((String) item.getValue(0))));
+ // chartList.add(CatalogueOpener.cleanTitle(((String)
+ // item.getValue(0))));
chartList.add((String) item.getValue(5));
// open wizard
@@ -109,7 +114,7 @@
if (resourceType.equals(ResourceTypeNew.DATASET))
contextMenu.add(openAsChart);
- /* ***** OPEN AS A MAP ***** */
+ /* OPEN AS A MAP */
final MenuItem openAsMap = new MenuItem(Style.PUSH);
openAsMap.setText(Fenix.fenixLang.openAsMap());
@@ -154,7 +159,7 @@
contextMenu.add(separator);
}
- /* ***** OPEN AS A TABLE ***** */
+ /* OPEN AS A TABLE */
MenuItem openAsTable = new MenuItem(Style.PUSH);
openAsTable.setText(Fenix.fenixLang.openAsTable());
openAsTable.addSelectionListener(new SelectionListener() {
@@ -191,7 +196,7 @@
contextMenu.add(separator);
}
- /* ***** DUPLICATE ***** */
+ /* DUPLICATE */
MenuItem duplicate = new MenuItem(Style.PUSH);
duplicate.setText(Fenix.fenixLang.duplicate());
duplicate.addSelectionListener(new SelectionListener() {
@@ -205,7 +210,7 @@
separator = new MenuItem(Style.SEPARATOR);
contextMenu.add(separator);
- /* ***** EXPORT ***** */
+ /* EXPORT */
MenuItem export = new MenuItem(Style.PUSH);
export.setText(Fenix.fenixLang.export());
export.addSelectionListener(new SelectionListener() {
@@ -216,7 +221,7 @@
export.setEnabled(false);
contextMenu.add(export);
- /* ***** DELETE ***** */
+ /* DELETE */
MenuItem delete = new MenuItem(Style.PUSH);
delete.setText(Fenix.fenixLang.delete());
delete.addSelectionListener(new SelectionListener() {
@@ -226,7 +231,7 @@
});
contextMenu.add(delete);
- /* ***** RENAME ***** */
+ /* RENAME */
MenuItem rename = new MenuItem(Style.PUSH);
rename.setText(Fenix.fenixLang.rename());
rename.addSelectionListener(new SelectionListener() {
@@ -239,7 +244,7 @@
separator = new MenuItem(Style.SEPARATOR);
contextMenu.add(separator);
- /* ***** VIEW METADATA ***** */
+ /* VIEW METADATA */
MenuItem viewMetadata = new MenuItem(Style.PUSH);
viewMetadata.setText(Fenix.fenixLang.viewMetadata());
viewMetadata.addSelectionListener(new SelectionListener() {
@@ -252,7 +257,7 @@
});
contextMenu.add(viewMetadata);
- /* ***** LINKED RESOURCES ***** */
+ /* LINKED RESOURCES */
MenuItem linkedResources = new MenuItem(Style.PUSH);
linkedResources.setText(Fenix.fenixLang.linkedResources());
linkedResources.addSelectionListener(new SelectionListener() {
@@ -266,7 +271,7 @@
separator = new MenuItem(Style.SEPARATOR);
contextMenu.add(separator);
- /* ***** SHARE RESOURCE ***** */
+ /* SHARE RESOURCE */
MenuItem shareResource = new MenuItem(Style.PUSH);
shareResource.setText(Fenix.fenixLang.shareResource());
shareResource.addSelectionListener(new SelectionListener() {
@@ -286,70 +291,99 @@
public void onSuccess(Object result) {
String digest = (String) result;
com.setDigest(digest);
- // push the information to other nodes. I had to put this inside another asynchronous call in order to calculate and send to the WS the digest for the shared resource.
+ // push the information to other nodes. I had to put
+ // this inside another asynchronous call in order to
+ // calculate and send to the WS the digest for the
+ // shared resource.
Fenix.communicationService.pushInformation(Fenix.fenixServicesUrl, com, new AsyncCallback() {
public void onSuccess(Object result) {
- new FenixDebugShell("<ul><b>" + Fenix.fenixLang.giewsNetwork() + "</b></ul><ul>" + (String) result + "</ul>");
+ new FenixDebugShell("<ul><b>" + Fenix.fenixLang.giewsNetwork() + "</b></ul><ul>"
+ + (String) result + "</ul>");
progress.destroy();
}
public void onFailure(Throwable caught) {
- new FenixDebugShell("<ul><b>CatalogueContextMenu</b></ul><ul>RPC to pushInformation(resource).</ul><ul>" + caught.getMessage() + "</ul>");
+ new FenixDebugShell(
+ "<ul><b>CatalogueContextMenu</b></ul><ul>RPC to pushInformation(resource).</ul><ul>"
+ + caught.getMessage() + "</ul>");
progress.destroy();
}
});
}
public void onFailure(Throwable caught) {
- new FenixDebugShell("<ul><b>CatalogueContextMenu</b></ul><ul>RPC to pushInformation(resource).</ul><ul>" + caught.getMessage() + "</ul>");
+ new FenixDebugShell(
+ "<ul><b>CatalogueContextMenu</b></ul><ul>RPC to pushInformation(resource).</ul><ul>"
+ + caught.getMessage() + "</ul>");
progress.destroy();
}
});
}
});
- if (resourceType.equals(ResourceTypeNew.DATASET) || resourceType.equals(ResourceTypeNew.LAYER))
- if (((ListBox) Fenix.newResourceExplorer.searchMask.scope).getItemText(((ListBox) Fenix.newResourceExplorer.searchMask.scope).getSelectedIndex()).equals(Fenix.fenixLang.thisNode()))
+
+ if (resourceType.equals(ResourceTypeNew.DATASET) || resourceType.equals(ResourceTypeNew.LAYER)) {
+ if (Fenix.newResourceExplorer.searchMask.scope != null) {
+ String scope = Fenix.newResourceExplorer.searchMask.scope
+ .getItemText(Fenix.newResourceExplorer.searchMask.scope.getSelectedIndex());
+ if (scope.equals(Fenix.fenixLang.thisNode()))
+ contextMenu.add(shareResource);
+ } else {
+ // if no scope is defined, local scope is assumed
contextMenu.add(shareResource);
-
- /* ***** DOWNLOAD RESOURCE ***** */
+ }
+ }
+ /* DOWNLOAD RESOURCE */
MenuItem downloadResource = new MenuItem(Style.PUSH);
downloadResource.setText(Fenix.fenixLang.downloadResource());
downloadResource.addSelectionListener(new SelectionListener() {
public void widgetSelected(BaseEvent be) {
TableItem item = Fenix.newResourceExplorer.catalogueList.table.getSelectedItem();
final String localResourceId = (String) item.getValues()[3];
- String scope = Fenix.newResourceExplorer.searchMask.scope.getItemText(Fenix.newResourceExplorer.searchMask.scope.getSelectedIndex());
+ String scope = Fenix.newResourceExplorer.searchMask.scope
+ .getItemText(Fenix.newResourceExplorer.searchMask.scope.getSelectedIndex());
if (!scope.equals(Fenix.fenixLang.thisNode())) {
final Loading progress = new Loading();
progress.create();
- Fenix.communicationService.downloadResource((String) item.getValues()[2], localResourceId, new AsyncCallback() {
- public void onSuccess(Object result) {
- Fenix.communicationService.importDataset(localResourceId, new AsyncCallback() {
+ Fenix.communicationService.downloadResource((String) item.getValues()[2], localResourceId,
+ new AsyncCallback() {
public void onSuccess(Object result) {
- new FenixDebugShell("Resource has been downloaded.");
- progress.destroy();
+ Fenix.communicationService.importDataset(localResourceId, new AsyncCallback() {
+ public void onSuccess(Object result) {
+ new FenixDebugShell("Resource has been downloaded.");
+ progress.destroy();
+ }
+
+ public void onFailure(Throwable caught) {
+ new FenixDebugShell(
+ "<ul><b>CatalogueContextMenu</b></ul><ul>RPC to downloadResource(id).</ul><ul>"
+ + caught.getMessage() + "</ul>");
+ progress.destroy();
+ }
+ });
}
public void onFailure(Throwable caught) {
- new FenixDebugShell("<ul><b>CatalogueContextMenu</b></ul><ul>RPC to downloadResource(id).</ul><ul>" + caught.getMessage() + "</ul>");
+ new FenixDebugShell(
+ "<ul><b>CatalogueContextMenu</b></ul><ul>RPC to downloadResource(id).</ul><ul>"
+ + caught.getMessage() + "</ul>");
progress.destroy();
}
});
- }
-
- public void onFailure(Throwable caught) {
- new FenixDebugShell("<ul><b>CatalogueContextMenu</b></ul><ul>RPC to downloadResource(id).</ul><ul>" + caught.getMessage() + "</ul>");
- progress.destroy();
- }
- });
} else
- new FenixDebugShell("We're sorry, but you can not download a resource from your own node. Please change the search scope to 'This Group' or 'GIEWS Network'. Thank you.");
+ new FenixDebugShell(
+ "We're sorry, but you can not download a resource from your own node. Please change the search scope to 'This Group' or 'GIEWS Network'. Thank you.");
}
});
Info.show("CATALOGUE", "Resource type {0}", resourceType);
- if (resourceType.equals(ResourceTypeNew.DATASET) || resourceType.equals(ResourceTypeNew.LAYER) || resourceType.equals("dataset"));
- //if (!((ListBox) Fenix.newResourceExplorer.searchMask.scope).getItemText(((ListBox) Fenix.newResourceExplorer.searchMask.scope).getSelectedIndex()).equals(Fenix.fenixLang.thisNode()))
- contextMenu.add(downloadResource);
+ if (resourceType.equals(ResourceTypeNew.DATASET) || resourceType.equals(ResourceTypeNew.LAYER)
+ || resourceType.equals("dataset"))
+ ;
+ // if (!((ListBox)
+ // Fenix.newResourceExplorer.searchMask.scope).getItemText(((ListBox)
+ // Fenix
+ // .newResourceExplorer.searchMask.scope).getSelectedIndex()).equals
+ // (Fenix.fenixLang.thisNode()))
+ contextMenu.add(downloadResource);
// URL to share birt report
MenuItem birtReportURL = new MenuItem(Style.PUSH);
@@ -358,7 +392,8 @@
public void widgetSelected(BaseEvent be) {
birtURL = Fenix.fenixServicesUrl;
final TableItem item = Fenix.newResourceExplorer.catalogueList.table.getSelectedItem();
- // parser URL http://host:port/fenix-services/services/CommunicationModuleService
+ // parser URL http://host:port/fenix-services/services/
+ // CommunicationModuleService
int numSlash = 3;
for (int i = (birtURL.length() - 1); i > 0; i--) {
if (birtURL.charAt(i) == '/') {
@@ -373,7 +408,9 @@
Fenix.birtService.getBirtApplName(new AsyncCallback() {
public void onSuccess(Object result) {
- new FenixDebugShell("You can add that link in your web site to view the report<br>" + birtURL + "/" + (String) result + "/FenixBirtServlet?dataViewId=" + (String) item.getValues()[5] + "&servletType=frameset");
+ new FenixDebugShell("You can add that link in your web site to view the report<br>" + birtURL
+ + "/" + (String) result + "/FenixBirtServlet?dataViewId="
+ + (String) item.getValues()[5] + "&servletType=frameset");
}
public void onFailure(Throwable caught) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2008-07-15 09:25:26
|
Revision: 4605
http://giews.svn.sourceforge.net/giews/?rev=4605&view=rev
Author: jgeromo
Date: 2008-07-15 02:25:36 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
preparing installer for RC3
set C:\GIEWS_Workstation as the default installation path; space in installation path causes problem in starting fenix-web
sets Tomcat service's JvmMx=1024
Modified Paths:
--------------
trunk/fenix-installer/build.properties
trunk/fenix-installer/build.xml
trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml
trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat
Modified: trunk/fenix-installer/build.properties
===================================================================
--- trunk/fenix-installer/build.properties 2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/build.properties 2008-07-15 09:25:36 UTC (rev 4605)
@@ -1,15 +1,15 @@
#full-exe-name = customization-exe-name + app-version
customization-exe-name=workstation-installer
-app-version=3.0-RC2
-fenix-web-file=fenix-web-0.0.7.war
-#fenix-web-location=\\ldvapp07\Tomcat-FENIXDEV\webapps\fenix-web-0.0.7
-fenix-web-location=D:/workspaces/fenix/fenix-installer/src/resources/fenix-web_geoserver/fenix-web-0.0.7
-fenix-birt-file=fenix-birt-0.0.7.war
-fenix-services-file=fenix-services-0.0.7.war
+app-version=3.0-RC3
+fenix-web-file=fenix-web-0.0.8.war
+#fenix-web-location=\\ldvapp07\Tomcat-FENIXDEV\webapps\fenix-web-0.0.8
+fenix-web-location=C:/workspaces/fenixweb/fenix-installer/src/resources/fenix-web_geoserver/fenix-web-0.0.8
+fenix-birt-file=fenix-birt-0.0.8.war
+fenix-services-file=fenix-services-0.0.8.war
geoserver-file=geoserverDemo.war
#geoserver-location=\\ldvapp07\Tomcat-FENIXDEV\webapps\geoserverDev
-geoserver-location=D:/workspaces/fenix/fenix-installer/src/resources/fenix-web_geoserver/geoserverDev
+geoserver-location=C:/workspaces/fenixweb/fenix-installer/src/resources/fenix-web_geoserver/geoserverDev
host-url=http://localhost:$HTTP_PORT_NO
#izpack/conf/fenix-izpack-windows.xml /installation/info/@appname
Modified: trunk/fenix-installer/build.xml
===================================================================
--- trunk/fenix-installer/build.xml 2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/build.xml 2008-07-15 09:25:36 UTC (rev 4605)
@@ -191,6 +191,7 @@
<include name="shortcutSpec.xml" />
<include name="userInputSpec.xml" />
<include name="fenix-izpack-windows.xml" />
+ <include name="targetdir.txt" />
</fileset>
</copy>
<copy todir="../build/resources/jakarta-tomcat/conf">
Modified: trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml
===================================================================
--- trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml 2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/src/resources/izpack/conf/fenix-izpack-windows.xml 2008-07-15 09:25:36 UTC (rev 4605)
@@ -42,6 +42,7 @@
src="../build/resources/izpack/conf/shortcutSpec.xml" />
<res id="userInputSpec.xml"
src="../build/resources/izpack/conf/userInputSpec.xml" />
+ <res id="TargetPanel.dir" src="../build/resources/izpack/conf/targetdir.txt" />
</resources>
<panels>
<panel classname="HelloPanel" />
Modified: trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat
===================================================================
--- trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat 2008-07-15 09:21:31 UTC (rev 4604)
+++ trunk/fenix-installer/src/resources/scripts/service-GIEWSWorkstation.bat 2008-07-15 09:25:36 UTC (rev 4605)
@@ -90,7 +90,7 @@
set PR_JVM=auto
:foundJvm
echo Using JVM: %PR_JVM%
-"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
+"%EXECUTABLE%" //IS//%SERVICE_NAME% --JvmMx=1024 --StartClass org.apache.catalina.startup.Bootstrap --StopClass org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
if not errorlevel 1 goto installed
echo Failed installing '%SERVICE_NAME%' service
goto end
@@ -108,7 +108,7 @@
set PR_LOGPATH=%CATALINA_BASE%\logs
set PR_STDOUTPUT=auto
set PR_STDERROR=auto
-"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 256
+"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions "-Djava.io.tmpdir=%CATALINA_BASE%\temp" --JvmMs 128 --JvmMx 1024
echo The service '%SERVICE_NAME%' has been installed.
:end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kal...@us...> - 2008-07-15 09:21:23
|
Revision: 4604
http://giews.svn.sourceforge.net/giews/?rev=4604&view=rev
Author: kalimaha
Date: 2008-07-15 02:21:31 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Added functionalities and fake data for FPI.
Modified Paths:
--------------
trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/info/dataset/DatasetDao.java
trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/Pog.java
trunk/fenix-persistence/src/test/java/org/fao/fenix/persistence/info/dataset/DatasetDaoTest.java
Added Paths:
-----------
trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/FPIPog.java
Modified: trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/info/dataset/DatasetDao.java
===================================================================
--- trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/info/dataset/DatasetDao.java 2008-07-15 09:16:35 UTC (rev 4603)
+++ trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/info/dataset/DatasetDao.java 2008-07-15 09:21:31 UTC (rev 4604)
@@ -11,13 +11,12 @@
import org.apache.log4j.Logger;
import org.fao.fenix.domain.exception.FenixException;
-import org.fao.fenix.domain.gaul.FenixGaul0;
import org.fao.fenix.domain.index.EconomicsIndex;
import org.fao.fenix.domain.info.content.NumericCommodity;
import org.fao.fenix.domain.info.dataset.Dataset;
+import org.fao.fenix.domain.info.dataset.PriceTradeDataset;
+import org.fao.fenix.domain.info.pattern.DatasetUtil;
import org.fao.fenix.domain.info.pattern.price.PriceDataset;
-import org.fao.fenix.domain.info.pattern.DatasetUtil;
-import org.fao.fenix.domain.info.pattern.price.InternationalPriceDataset;
import org.fao.fenix.domain.testdata.Constants;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
@@ -170,6 +169,35 @@
return entityManager.createQuery("from " + dataset + " dataset").getResultList();
}
+ public List<NumericCommodity> findAllNumericCommodityForIndexBase(String priceType, String commodityCode, String featureCode, int startYear, int endYear) {
+ List<PriceDataset> list = findAllPriceDataset(priceType);
+ List<NumericCommodity> commodities = new ArrayList<NumericCommodity>();
+ for (int i = 0; i < list.size(); i++) {
+ List<NumericCommodity> tmp = list.get(i).getContentList();
+ for (int j = 0; j < tmp.size(); j++) {
+ NumericCommodity commodity = tmp.get(j);
+ boolean rangeCondition = (commodity.getDate().getYear() >= (startYear)) && (commodity.getDate().getYear() <= (endYear));
+ if (commodity.getCommodityCode().equals(commodityCode) && commodity.getFeatureCode().equals(featureCode) && rangeCondition)
+ commodities.add(commodity);
+ }
+ }
+ return commodities;
+ }
+
+ public List<NumericCommodity> findAllNumericCommodityForIndex(String priceType, String commodityCode, String featureCode) {
+ List<PriceDataset> list = findAllPriceDataset(priceType);
+ List<NumericCommodity> commodities = new ArrayList<NumericCommodity>();
+ for (int i = 0; i < list.size(); i++) {
+ List<NumericCommodity> tmp = list.get(i).getContentList();
+ for (int j = 0; j < tmp.size(); j++) {
+ NumericCommodity commodity = tmp.get(j);
+ if (commodity.getCommodityCode().equals(commodityCode) && commodity.getFeatureCode().equals(featureCode))
+ commodities.add(commodity);
+ }
+ }
+ return commodities;
+ }
+
public List<NumericCommodity> findAllNumericCommodityForIndex(String priceType, String commodityCode, String featureCode, int startYear, int endYear) {
List<PriceDataset> list = findAllPriceDataset(priceType);
List<NumericCommodity> commodities = new ArrayList<NumericCommodity>();
@@ -187,7 +215,7 @@
public double calculateCommodityBasePrice(String priceType, String commodityCode, String featureCode, int startYear, int endYear) {
double total = 0;
- List<NumericCommodity> list = findAllNumericCommodityForIndex(priceType, commodityCode, featureCode, startYear, endYear);
+ List<NumericCommodity> list = findAllNumericCommodityForIndexBase(priceType, commodityCode, featureCode, startYear, endYear);
for (int i = 0; i < list.size(); i++)
total += list.get(i).getValue();
return total / list.size();
Added: trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/FPIPog.java
===================================================================
--- trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/FPIPog.java (rev 0)
+++ trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/FPIPog.java 2008-07-15 09:21:31 UTC (rev 4604)
@@ -0,0 +1,37 @@
+package org.fao.fenix.persistence.testdata;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.fao.fenix.domain.info.content.NumericCommodity;
+import org.fao.fenix.domain.info.pattern.price.WholesalePriceDataset;
+
+public class FPIPog {
+
+ public static List<NumericCommodity> baseCommodities = new ArrayList<NumericCommodity>();
+
+ public static double[] baseCommoditiesPrices = new double[] { 221.05, 227.05, 230.00, 232.00, 234.15, 228.25, 219.25, 219.25, 193.05, 185.00, 160.00, 159.05, 159.15, 158.25, 153.06, 144.15, 143.00, 131.25, 117.05, 120.00, 116.25, 117.05, 121.06,
+ 121.15, 120.00, 118.15, 125.00, 126.00, 137.06, 176.25, 181.25, 177.00, 174.15, 188.00, 167.05, 182.05 };
+
+ public static double[] commoditiesPrices = new double[] { 197.00, 197.05, 210.00, 210.00, 202.00, 207.05, 220.00, 231.25, 236.25, 217.00, 191.25, 200.00, 201.00, 231.25, 227.05, 227.00, 239.15, 251.25, 250.00, 261.25, 260.00, 227.05, 204.15, 209.00,
+ 206.25, 236.25, 242.05, 234.15, 246.25, 246.00, 245.00, 239.15, 237.00, 229.15, 240.00, 238.00, 251.25, 271.25, 285.00, 294.15, 310.00, 330.00, 363.33, 337.00, 365.00, 327.05, 347.00, 381.25, 360.00, 390.00, };
+
+ public static WholesalePriceDataset createFakeFPIData() {
+ WholesalePriceDataset dataset = new WholesalePriceDataset();
+ int year = 1999;
+ for (int i = 0; i < baseCommoditiesPrices.length; i++) {
+ if (i % 12 == 0)
+ year++;
+ baseCommodities.add(new NumericCommodity("0", "01", new Date(year, 0, 1), baseCommoditiesPrices[i]));
+ }
+ for (int i = 0; i < commoditiesPrices.length; i++) {
+ if (i % 12 == 0)
+ year++;
+ baseCommodities.add(new NumericCommodity("0", "01", new Date(year, 0, 1), commoditiesPrices[i]));
+ }
+ dataset.setContentList(baseCommodities);
+ return dataset;
+ }
+
+}
Property changes on: trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/FPIPog.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/Pog.java
===================================================================
--- trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/Pog.java 2008-07-15 09:16:35 UTC (rev 4603)
+++ trunk/fenix-persistence/src/main/java/org/fao/fenix/persistence/testdata/Pog.java 2008-07-15 09:21:31 UTC (rev 4604)
@@ -90,6 +90,9 @@
measurementUnitSI.initiateSI();
*/
+ /* FAKE FPI DATA */
+ datasetDao.save(FPIPog.createFakeFPIData());
+
System.out.println("---------------------- end Pog.populateDB()");
}
Modified: trunk/fenix-persistence/src/test/java/org/fao/fenix/persistence/info/dataset/DatasetDaoTest.java
===================================================================
--- trunk/fenix-persistence/src/test/java/org/fao/fenix/persistence/info/dataset/DatasetDaoTest.java 2008-07-15 09:16:35 UTC (rev 4603)
+++ trunk/fenix-persistence/src/test/java/org/fao/fenix/persistence/info/dataset/DatasetDaoTest.java 2008-07-15 09:21:31 UTC (rev 4604)
@@ -6,6 +6,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.log4j.Logger;
+import org.fao.fenix.domain.info.content.NumericCommodity;
import org.fao.fenix.domain.info.dataset.Dataset;
import org.fao.fenix.domain.info.pattern.cropproduction.CropAreaDataset;
import org.fao.fenix.domain.info.pattern.cropproduction.CropProductionDataset;
@@ -13,6 +15,8 @@
import org.fao.fenix.domain.upload.FenixLoader;
import org.fao.fenix.persistence.BaseDaoTest;
import org.fao.fenix.persistence.perspective.FenixDomainUserDao;
+import org.fao.fenix.persistence.testdata.FPIPog;
+import org.fao.fenix.persistence.testdata.Pog;
public class DatasetDaoTest extends BaseDaoTest {
@@ -172,6 +176,13 @@
list = datasetDao.findAllForPager(2, 4);
assertTrue(list.size() == 4);
}
+
+ public void _testFindAllNumericCommodityForIndex() {
+ datasetDao.save(FPIPog.createFakeFPIData());
+ assertTrue(datasetDao.findAll().size() == 1);
+ List<NumericCommodity> list = datasetDao.findAllNumericCommodityForIndex("Wholesale", "010101", "featureCode");
+ System.out.println("RETRIEVED " + list.size() + " COMMODITIES");
+ }
public DatasetDao getDatasetDao() {
return datasetDao;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jg...@us...> - 2008-07-15 09:16:26
|
Revision: 4603
http://giews.svn.sourceforge.net/giews/?rev=4603&view=rev
Author: jgeromo
Date: 2008-07-15 02:16:35 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
removing datasets which are no longer needed
Removed Paths:
-------------
trunk/fenix-domain/src/main/resources/datasets/0-Ethiopia Level 1 Livestock/
trunk/fenix-domain/src/main/resources/datasets/1-Ethiopia Markets Retail Prices/
trunk/fenix-domain/src/main/resources/datasets/2-Ethiopia Level 2 Population/
trunk/fenix-domain/src/main/resources/datasets/3-Ethiopia Level 3 CropArea/
trunk/fenix-domain/src/main/resources/datasets/4-Ethiopia Level 3 CropProduction/
trunk/fenix-domain/src/main/resources/datasets/5-Ethiopia Export Quantity/
trunk/fenix-domain/src/main/resources/datasets/6-Ethiopia Export Value/
trunk/fenix-domain/src/main/resources/datasets/7-Ethiopia Import Value/
trunk/fenix-domain/src/main/resources/datasets/8-Ethiopia Imports Quantity and FoodAid/
trunk/fenix-domain/src/main/resources/datasets/Ethiopia Level 3 Population/
trunk/fenix-domain/src/main/resources/datasets/Ethiopia Markets Wholesale Prices/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sal...@us...> - 2008-07-15 09:11:00
|
Revision: 4602
http://giews.svn.sourceforge.net/giews/?rev=4602&view=rev
Author: salvatore_contu
Date: 2008-07-15 02:11:09 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
changed paths for gwt stuff
Modified Paths:
--------------
trunk/fenix-web-2/LINUX-Compile.launch
trunk/fenix-web-2/LINUX-Hosted-Mode.launch
trunk/fenix-web-2/WINDOWS-Compile.launch
trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch
Modified: trunk/fenix-web-2/LINUX-Compile.launch
===================================================================
--- trunk/fenix-web-2/LINUX-Compile.launch 2008-07-15 09:08:12 UTC (rev 4601)
+++ trunk/fenix-web-2/LINUX-Compile.launch 2008-07-15 09:11:09 UTC (rev 4602)
@@ -12,8 +12,8 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web-2" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/ext-gwt-1.0.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/gwt-user-1.5.RC1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/ext-gwt-1.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linuxRC1/gwt-user.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linuxRC1/gwt-dev-linux.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
Modified: trunk/fenix-web-2/LINUX-Hosted-Mode.launch
===================================================================
--- trunk/fenix-web-2/LINUX-Hosted-Mode.launch 2008-07-15 09:08:12 UTC (rev 4601)
+++ trunk/fenix-web-2/LINUX-Hosted-Mode.launch 2008-07-15 09:11:09 UTC (rev 4602)
@@ -12,9 +12,9 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/ext-gwt-1.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/ext-gwt-1.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linuxRC1/gwt-dev-linux.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/gwt-user-1.5.RC1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/linuxRC1/gwt-user.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
Modified: trunk/fenix-web-2/WINDOWS-Compile.launch
===================================================================
--- trunk/fenix-web-2/WINDOWS-Compile.launch 2008-07-15 09:08:12 UTC (rev 4601)
+++ trunk/fenix-web-2/WINDOWS-Compile.launch 2008-07-15 09:11:09 UTC (rev 4602)
@@ -12,9 +12,9 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web-2" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/ext-gwt-1.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/ext-gwt-1.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-dev-windows-RC1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/gwt-user-1.5.RC1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-user-RC1.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
Modified: trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch
===================================================================
--- trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch 2008-07-15 09:08:12 UTC (rev 4601)
+++ trunk/fenix-web-2/WINDOWS-Hosted-Mode.launch 2008-07-15 09:11:09 UTC (rev 4602)
@@ -12,9 +12,9 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER" javaProject="fenix-web-2" path="1" type="4"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/src/main/java" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/ext-gwt-1.0.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/ext-gwt-1.0.jar" path="3" type="2"/> "/>
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-dev-windows-RC1.jar" path="3" type="2"/> "/>
-<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-web-2/target/fenix-web-2-0.0.1-SNAPSHOT/WEB-INF/lib/gwt-user-1.5.RC1.jar" path="3" type="2"/> "/>
+<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/fenix-gwt-dev/windows/gwt-user-RC1.jar" path="3" type="2"/> "/>
</listAttribute>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.GWTShell"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sal...@us...> - 2008-07-15 09:08:04
|
Revision: 4601
http://giews.svn.sourceforge.net/giews/?rev=4601&view=rev
Author: salvatore_contu
Date: 2008-07-15 02:08:12 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
Added Paths:
-----------
trunk/fenix-gwt-dev/windows/gwt-user-RC1.jar
Added: trunk/fenix-gwt-dev/windows/gwt-user-RC1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/windows/gwt-user-RC1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sal...@us...> - 2008-07-15 08:55:16
|
Revision: 4600
http://giews.svn.sourceforge.net/giews/?rev=4600&view=rev
Author: salvatore_contu
Date: 2008-07-15 01:55:23 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
added ext
Added Paths:
-----------
trunk/fenix-gwt-dev/ext-gwt-1.0.jar
Added: trunk/fenix-gwt-dev/ext-gwt-1.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/fenix-gwt-dev/ext-gwt-1.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 08:36:28
|
Revision: 4599
http://giews.svn.sourceforge.net/giews/?rev=4599&view=rev
Author: erikvaningen
Date: 2008-07-15 01:36:28 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
pointing pom's to fenix-parent
Modified Paths:
--------------
trunk/fenix-web-2/pom.xml
Modified: trunk/fenix-web-2/pom.xml
===================================================================
--- trunk/fenix-web-2/pom.xml 2008-07-15 07:20:21 UTC (rev 4598)
+++ trunk/fenix-web-2/pom.xml 2008-07-15 08:36:28 UTC (rev 4599)
@@ -1,54 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.fao.fenix</groupId>
- <artifactId>fenix-web-2</artifactId>
- <packaging>war</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <description></description>
-<ciManagement>
- <system>Continuum</system>
- <url>http://168.202.78.45:8080/continuum</url>
- </ciManagement>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.fao.fenix</groupId>
+ <artifactId>fenix-parent</artifactId>
+ <version>0.0.8</version>
+ <relativePath>.../fenix-parent/pom.xml</relativePath>
+ </parent>
+ <name>fenix-web-2</name>
+ <artifactId>fenix-web-2</artifactId>
+ <version>${fenix.version}</version>
+ <modelVersion>4.0.0</modelVersion>
<scm>
- <connection>scm:svn:https://giews.svn.sourceforge.net/svnroot/giews/trunk/fenix-web</connection>
- <developerConnection>
- scm:svn:https://giews.svn.sourceforge.net/svnroot/giews/trunk/fenix-web
- </developerConnection>
+ <connection>scm:svn:https://giews.svn.sourceforge.net/svnroot/giews/trunk/fenix-web-2</connection>
+ <developerConnection> scm:svn:https://giews.svn.sourceforge.net/svnroot/giews/trunk/fenix-web-2 </developerConnection>
</scm>
<build>
<plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
<!-- gwtforge -->
- <!--
+ <!--
+ <plugin> <groupId>gwtforge.gwtplugin</groupId> <artifactId>gwtforge.gwtplugin</artifactId>
+ <version>1.5-dev-27-01-2008</version> <executions> <execution> <phase>install</phase> <goals> <goal>compile</goal>
+ </goals> </execution> </executions> <configuration> <out>/</out> <logLevel>INFO</logLevel>
+ <initialHeapSize>500m</initialHeapSize> <maximumHeapSize>1000m</maximumHeapSize> </configuration> </plugin>
+ -->
<plugin>
- <groupId>gwtforge.gwtplugin</groupId>
- <artifactId>gwtforge.gwtplugin</artifactId>
- <version>1.5-dev-27-01-2008</version>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <out>/</out>
- <logLevel>INFO</logLevel>
- <initialHeapSize>500m</initialHeapSize>
- <maximumHeapSize>1000m</maximumHeapSize>
- </configuration>
- </plugin>
- -->
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
<configuration>
@@ -58,36 +35,13 @@
</configuration>
</plugin>
</plugins>
-
</build>
-
<repositories>
-
- <repository>
- <id>java.net</id>
- <url>https://maven-repository.dev.java.net/nonav/repository</url>
- </repository>
- <repository>
- <releases>
- <updatePolicy>interval:10</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <updatePolicy>interval:10</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <id>fenix</id>
- <name>Fenix maven repository</name>
- <url>http://ldvapp07.fao.org:8030/fenixRepo</url>
- </repository>
-
<!-- gwtforge repo -->
<repository>
<id>gwtforge</id>
<url>http://gwtforge.com/maven-repository/trunk/</url>
</repository>
-
-
</repositories>
<!-- gwtforge -->
@@ -97,8 +51,6 @@
<url>http://gwtforge.com/maven-repository/trunk/</url>
</pluginRepository>
</pluginRepositories>
-
-
<dependencies>
<dependency>
<groupId>org.fao.fenix</groupId>
@@ -197,7 +149,6 @@
<artifactId>gwt-servlet</artifactId>
<version>1.5.RC1</version>
</dependency>
-
<dependency>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
@@ -208,7 +159,6 @@
<artifactId>menubar</artifactId>
<version>0</version>
</dependency>
-
<dependency>
<groupId>birt</groupId>
<artifactId>axis</artifactId>
@@ -236,7 +186,6 @@
<artifactId>htmlunit</artifactId>
<version>1.9</version>
</dependency>
-
<dependency>
<groupId>birt</groupId>
<artifactId>chartengineapi</artifactId>
@@ -258,27 +207,18 @@
<scope>system</scope>
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/commons-cli-1.0.jar</systemPath>
</dependency>
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>commons-codec-1.3</artifactId>
<version>0</version>
<scope>system</scope>
- <systemPath>
- ${basedir}/src/main/webapp/WEB-INF/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar
- </systemPath>
+ <systemPath> ${basedir}/src/main/webapp/WEB-INF/lib/org.apache.commons.codec_1.3.0.v20080530-1600.jar </systemPath>
</dependency>
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>commons-discovery-0.2</artifactId>
<version>0</version>
</dependency>
-
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>coreapi</artifactId>
@@ -314,17 +254,11 @@
<scope>system</scope>
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/flute.jar</systemPath>
</dependency>
-
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>jaxrpc</artifactId>
<version>0</version>
</dependency>
-
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>js</artifactId>
@@ -344,27 +278,21 @@
<artifactId>org.eclipse.emf.common_2.4.0.v200806091234</artifactId>
<version>0</version>
<scope>system</scope>
- <systemPath>
- ${basedir}/src/main/webapp/WEB-INF/lib/org.eclipse.emf.common_2.4.0.v200806091234.jar
- </systemPath>
+ <systemPath> ${basedir}/src/main/webapp/WEB-INF/lib/org.eclipse.emf.common_2.4.0.v200806091234.jar </systemPath>
</dependency>
<dependency>
<groupId>birt</groupId>
<artifactId>org.eclipse.emf.ecore_2.4.0.v200806091234</artifactId>
<version>0</version>
<scope>system</scope>
- <systemPath>
- ${basedir}/src/main/webapp/WEB-INF/lib/org.eclipse.emf.ecore_2.4.0.v200806091234.jar
- </systemPath>
+ <systemPath> ${basedir}/src/main/webapp/WEB-INF/lib/org.eclipse.emf.ecore_2.4.0.v200806091234.jar </systemPath>
</dependency>
<dependency>
<groupId>birt</groupId>
<artifactId>org.eclipse.emf.ecore.xmi_2.4.0.v200806091234</artifactId>
<version>0</version>
<scope>system</scope>
- <systemPath>
- ${basedir}/src/main/webapp/WEB-INF/lib/org.eclipse.emf.ecore.xmi_2.4.0.v200806091234.jar
- </systemPath>
+ <systemPath> ${basedir}/src/main/webapp/WEB-INF/lib/org.eclipse.emf.ecore.xmi_2.4.0.v200806091234.jar </systemPath>
</dependency>
<dependency>
<groupId>birt</groupId>
@@ -373,16 +301,11 @@
<scope>system</scope>
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/org.w3c.css.sac_1.3.0.v200805290154.jar</systemPath>
</dependency>
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>saaj</artifactId>
<version>0</version>
</dependency>
-
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>scriptapi</artifactId>
@@ -390,8 +313,6 @@
<scope>system</scope>
<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/scriptapi.jar</systemPath>
</dependency>
-
-
<dependency>
<groupId>birt</groupId>
<artifactId>viewservlets</artifactId>
@@ -402,20 +323,15 @@
<artifactId>wsdl4j-1.5.1</artifactId>
<version>0</version>
</dependency>
-
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<version>1.5.RC1</version>
</dependency>
- <!--
+ <!--
+ <dependency> <groupId>mygwt</groupId> <artifactId>mygwt</artifactId> <version>0.4.1</version> </dependency>
+ -->
<dependency>
- <groupId>mygwt</groupId>
- <artifactId>mygwt</artifactId>
- <version>0.4.1</version>
- </dependency>
- -->
- <dependency>
<groupId>ext-gwt</groupId>
<artifactId>ext-gwt</artifactId>
<version>1.0</version>
@@ -431,16 +347,5 @@
<artifactId>quartz</artifactId>
<version>1.5.2</version>
</dependency>
-
</dependencies>
- <distributionManagement>
- <repository>
- <id>fenix</id>
- <name>fenix repository</name>
- <url>scp://ldvapp07.fao.org:/usr/local/tomcat/6.0.14/FENIXDEMO/webapps/fenixRepo</url>
- </repository>
- </distributionManagement>
- <properties>
- <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server>
- </properties>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 07:20:12
|
Revision: 4598
http://giews.svn.sourceforge.net/giews/?rev=4598&view=rev
Author: erikvaningen
Date: 2008-07-15 00:20:21 -0700 (Tue, 15 Jul 2008)
Log Message:
-----------
adding org.fao.fenix. to the svn ignore
Property Changed:
----------------
trunk/fenix-web/
Property changes on: trunk/fenix-web
___________________________________________________________________
Name: svn:ignore
- target
.gwt-cache
+ target
.gwt-cache
org.fao.fenix.web.Fenix
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 06:50:21
|
Revision: 4597
http://giews.svn.sourceforge.net/giews/?rev=4597&view=rev
Author: erikvaningen
Date: 2008-07-14 23:50:29 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
pointing pom's to fenix-parent
Modified Paths:
--------------
trunk/fenix-map/pom.xml
Modified: trunk/fenix-map/pom.xml
===================================================================
--- trunk/fenix-map/pom.xml 2008-07-15 06:50:22 UTC (rev 4596)
+++ trunk/fenix-map/pom.xml 2008-07-15 06:50:29 UTC (rev 4597)
@@ -133,7 +133,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>2.5.4</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 06:50:13
|
Revision: 4596
http://giews.svn.sourceforge.net/giews/?rev=4596&view=rev
Author: erikvaningen
Date: 2008-07-14 23:50:22 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
pointing pom's to fenix-parent
Modified Paths:
--------------
trunk/fenix-web-2/pom.xml
Modified: trunk/fenix-web-2/pom.xml
===================================================================
--- trunk/fenix-web-2/pom.xml 2008-07-15 06:45:54 UTC (rev 4595)
+++ trunk/fenix-web-2/pom.xml 2008-07-15 06:50:22 UTC (rev 4596)
@@ -124,12 +124,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
- <version>2.5.4</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>2.5.4</version>
+ <version>${spring.version}</version>
</dependency>
<dependency><!-- needed by gwtforge -->
<groupId>org.apache.tapestry</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 06:45:45
|
Revision: 4595
http://giews.svn.sourceforge.net/giews/?rev=4595&view=rev
Author: erikvaningen
Date: 2008-07-14 23:45:54 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
pointing pom's to fenix-parent
Modified Paths:
--------------
trunk/fenix-web/pom.xml
Modified: trunk/fenix-web/pom.xml
===================================================================
--- trunk/fenix-web/pom.xml 2008-07-15 06:43:13 UTC (rev 4594)
+++ trunk/fenix-web/pom.xml 2008-07-15 06:45:54 UTC (rev 4595)
@@ -98,12 +98,12 @@
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
- <version>2.5.5</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>2.5.5</version>
+ <version>${spring.version}</version>
</dependency>
<dependency><!-- needed by gwtforge -->
<groupId>org.apache.tapestry</groupId>
@@ -375,7 +375,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>2.5.5</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>quartz</groupId>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 06:43:04
|
Revision: 4594
http://giews.svn.sourceforge.net/giews/?rev=4594&view=rev
Author: erikvaningen
Date: 2008-07-14 23:43:13 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
aligning with new version of spring plugin
Modified Paths:
--------------
trunk/fenix-services/.springBeans
Modified: trunk/fenix-services/.springBeans
===================================================================
--- trunk/fenix-services/.springBeans 2008-07-15 06:43:04 UTC (rev 4593)
+++ trunk/fenix-services/.springBeans 2008-07-15 06:43:13 UTC (rev 4594)
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
- <configExtensions>
- <configExtension>xml</configExtension>
- </configExtensions>
+ <version>1</version>
+ <pluginVersion><![CDATA[2.0.6.v200806241357]]></pluginVersion>
+ <configSuffixes>
+ <configSuffix><![CDATA[xml]]></configSuffix>
+ </configSuffixes>
+ <enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/main/webapp/WEB-INF/applicationContext.xml</config>
</configs>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 06:42:58
|
Revision: 4593
http://giews.svn.sourceforge.net/giews/?rev=4593&view=rev
Author: erikvaningen
Date: 2008-07-14 23:43:04 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
aligning with new version of spring plugin
Modified Paths:
--------------
trunk/fenix-persistence/.springBeans
Modified: trunk/fenix-persistence/.springBeans
===================================================================
--- trunk/fenix-persistence/.springBeans 2008-07-15 06:41:45 UTC (rev 4592)
+++ trunk/fenix-persistence/.springBeans 2008-07-15 06:43:04 UTC (rev 4593)
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<beansProjectDescription>
- <configExtensions>
- <configExtension>xml</configExtension>
- </configExtensions>
+ <version>1</version>
+ <pluginVersion><![CDATA[2.0.6.v200806241357]]></pluginVersion>
+ <configSuffixes>
+ <configSuffix><![CDATA[xml]]></configSuffix>
+ </configSuffixes>
+ <enableImports><![CDATA[false]]></enableImports>
<configs>
<config>src/test/resources/applicationContext-test.xml</config>
</configs>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <eri...@us...> - 2008-07-15 06:41:35
|
Revision: 4592
http://giews.svn.sourceforge.net/giews/?rev=4592&view=rev
Author: erikvaningen
Date: 2008-07-14 23:41:45 -0700 (Mon, 14 Jul 2008)
Log Message:
-----------
target in svn ignore
Property Changed:
----------------
trunk/fenix-fpi/
Property changes on: trunk/fenix-fpi
___________________________________________________________________
Name: svn:ignore
+ target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
