From 1fe8cd2e465b272c44d74ebfb8106958e09e8f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20D=C3=ADaz=20Torres?= Date: Tue, 30 Aug 2011 10:59:03 +0200 Subject: [PATCH 1/3] Maven packaging --- build.xml | 59 ++++++++- src/maven/all.xml | 78 ++++++++++++ src/maven/geoext-maven.xml | 219 +++++++++++++++++++++++++++++++++ src/maven/gxp-maven.xml | 219 +++++++++++++++++++++++++++++++++ src/maven/openlayers-maven.xml | 190 ++++++++++++++++++++++++++++ 5 files changed, 764 insertions(+), 1 deletion(-) create mode 100644 src/maven/all.xml create mode 100644 src/maven/geoext-maven.xml create mode 100644 src/maven/gxp-maven.xml create mode 100644 src/maven/openlayers-maven.xml diff --git a/build.xml b/build.xml index 09afe80c..7f64692d 100644 --- a/build.xml +++ b/build.xml @@ -101,7 +101,7 @@ - + Preparing for distribution. @@ -109,5 +109,62 @@ + + + + + + + + + Preparing for maven distribution. + + + + + Preparing openlayers for maven distribution. + + + + + + + + + + + + + + + + + Preparing geoext for maven distribution. + + + + + + + + + + + + + + Preparing gxp for maven distribution. + + + + + + + + + + + + diff --git a/src/maven/all.xml b/src/maven/all.xml new file mode 100644 index 00000000..b5deffb1 --- /dev/null +++ b/src/maven/all.xml @@ -0,0 +1,78 @@ + + + 4.0.0 + opengeo + gxp-maven-modules + 1.0-SNAPSHOT + pom + + + + + BSD + https://github.com/opengeo/gxp/raw/master/license.txt + + + + Maven modules to GXP use + https://github.com/opengeo/gxp/raw/master/license.txt + + + + adiaz + Alejandro Díaz Torres + adiaz@emergya.com + Emergya Consultoría + http://www.emergya.es + + Analista + + + + + 2011 + + + + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + + + + + + + nexus.releases + Nexus SiceCat Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCat Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + + + + UTF-8 + + + + + junit + junit + 3.8.1 + test + + + + openlayers-maven + geoext-maven + gxp-maven + + + diff --git a/src/maven/geoext-maven.xml b/src/maven/geoext-maven.xml new file mode 100644 index 00000000..9662ce23 --- /dev/null +++ b/src/maven/geoext-maven.xml @@ -0,0 +1,219 @@ + + + 4.0.0 + opengeo + geoext-maven + 1.0-SNAPSHOT + javascript + + + + + BSD + https://github.com/opengeo/gxp/raw/master/license.txt + + + + Geoext extensions + https://github.com/opengeo/gxp/raw/master/license.txt + + + + adiaz + Alejandro Díaz Torres + adiaz@emergya.com + Emergya Consultoría + http://www.emergya.es + + Analista + + + + + 2011 + + + + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + + + + + + + nexus.releases + Nexus SiceCat Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCat Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + + + + + opengeo + openlayers-maven + 1.0-SNAPSHOT + jar + + + + + target/scripts + target/test-scripts + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + javascript + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + + opengeo + openlayers-maven + 1.0-SNAPSHOT + javascript + + + + + + release + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + prepare-tests + jsunit + compress + + + + + + + + + + + opengeo + openlayers-maven + 1.0-SNAPSHOT + javascript + + + + + + + + nexus.releases + Nexus Releases + http://nexus.emergya.es/nexus/content/groups/public/ + + + nexus.sicecat.releases + Nexus SiceCAT Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCAT Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + false + + + true + + + + + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ + + false + + + true + + + + + + + + nexus.snapshot + Nexus Public Snapshots + http://nexus.emergya.es/nexus/content/groups/public-snapshots/ + + true + + + false + + + + + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ + + + true + + + + never + + + + + diff --git a/src/maven/gxp-maven.xml b/src/maven/gxp-maven.xml new file mode 100644 index 00000000..af193a04 --- /dev/null +++ b/src/maven/gxp-maven.xml @@ -0,0 +1,219 @@ + + + 4.0.0 + opengeo + gxp-maven + 1.0-SNAPSHOT + javascript + + + + + BSD + https://github.com/opengeo/gxp/raw/master/license.txt + + + + GXP library extension + https://github.com/opengeo/gxp/raw/master/license.txt + + + + adiaz + Alejandro Díaz Torres + adiaz@emergya.com + Emergya Consultoría + http://www.emergya.es + + Analista + + + + + 2011 + + + + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + + + + + + + nexus.releases + Nexus SiceCat Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCat Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + + + + + opengeo + geoext-maven + 1.0-SNAPSHOT + jar + + + + + target/scripts + target/test-scripts + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + javascript + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + + opengeo + geoext-maven + 1.0-SNAPSHOT + javascript + + + + + + release + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + prepare-tests + jsunit + compress + + + + + + + + + + + opengeo + geoext-maven + 1.0-SNAPSHOT + javascript + + + + + + + + nexus.releases + Nexus Releases + http://nexus.emergya.es/nexus/content/groups/public/ + + + nexus.sicecat.releases + Nexus SiceCAT Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCAT Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + false + + + true + + + + + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ + + false + + + true + + + + + + + + nexus.snapshot + Nexus Public Snapshots + http://nexus.emergya.es/nexus/content/groups/public-snapshots/ + + true + + + false + + + + + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ + + + true + + + + never + + + + + diff --git a/src/maven/openlayers-maven.xml b/src/maven/openlayers-maven.xml new file mode 100644 index 00000000..c80c10dc --- /dev/null +++ b/src/maven/openlayers-maven.xml @@ -0,0 +1,190 @@ + + + 4.0.0 + opengeo + openlayers-maven + 1.0-SNAPSHOT + javascript + + + + + BSD + https://github.com/opengeo/gxp/raw/master/license.txt + + + + Openlayers library + https://github.com/opengeo/gxp/raw/master/license.txt + + + + adiaz + Alejandro Díaz Torres + adiaz@emergya.com + Emergya Consultoría + http://www.emergya.es + + Analista + + + + + 2011 + + + + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + + + + + + + nexus.releases + Nexus SiceCat Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCat Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + + + + target/scripts + target/test-scripts + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + javascript + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + release + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + prepare-tests + jsunit + compress + + + + + + + + + + + + nexus.releases + Nexus Releases + http://nexus.emergya.es/nexus/content/groups/public/ + + + nexus.sicecat.releases + Nexus SiceCAT Releases + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ + + + + nexus.snapshots + Nexus SiceCAT Snapshot + http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ + + false + + + true + + + + + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ + + false + + + true + + + + + + + + nexus.snapshot + Nexus Public Snapshots + http://nexus.emergya.es/nexus/content/groups/public-snapshots/ + + true + + + false + + + + + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ + + + true + + + + never + + + + + From 6c095a8a205b1aa3cc2420df8f61f9a218cc786e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20D=C3=ADaz=20Torres?= Date: Wed, 31 Aug 2011 11:58:33 +0200 Subject: [PATCH 2/3] Init Ext.QuickTips in query.js solves javascript exception --- examples/query.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/examples/query.js b/examples/query.js index 4e3365b1..8fef2d3e 100644 --- a/examples/query.js +++ b/examples/query.js @@ -20,6 +20,9 @@ Ext.onReady(function() { var vector = new OpenLayers.Layer.Vector(); map.addLayers([wms, vector]); map.setCenter(new OpenLayers.LonLat(-120, 45), 5); + + //Init ext quicktips + Ext.QuickTips.init(); panel = new gxp.QueryPanel({ title: "Query Panel", From a11919ec92ea1b0539ad94da4a0c30574b2d76c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20D=C3=ADaz=20Torres?= Date: Fri, 2 Sep 2011 11:17:19 +0200 Subject: [PATCH 3/3] Poms modifications with projects information --- build.xml | 2 +- src/maven/geoext-maven.xml | 229 +++++++++++---------------------- src/maven/gxp-maven.xml | 228 +++++++++++--------------------- src/maven/openlayers-maven.xml | 187 ++++++++------------------- 4 files changed, 207 insertions(+), 439 deletions(-) diff --git a/build.xml b/build.xml index 7f64692d..a6bffdbe 100644 --- a/build.xml +++ b/build.xml @@ -101,7 +101,7 @@ - + Preparing for distribution. diff --git a/src/maven/geoext-maven.xml b/src/maven/geoext-maven.xml index 9662ce23..4e3234a2 100644 --- a/src/maven/geoext-maven.xml +++ b/src/maven/geoext-maven.xml @@ -1,65 +1,28 @@ 4.0.0 - opengeo + org.geoext geoext-maven 1.0-SNAPSHOT javascript - - - BSD - https://github.com/opengeo/gxp/raw/master/license.txt - - - - Geoext extensions - https://github.com/opengeo/gxp/raw/master/license.txt - - - - adiaz - Alejandro Díaz Torres - adiaz@emergya.com - Emergya Consultoría - http://www.emergya.es - - Analista - - - - - 2011 - - - - - - scm:git://github.com/opengeo/gxp/raw/master - scm:git://github.com/opengeo/gxp/raw/master - https://github.com/opengeo/gxp/raw/master - + Geoext library + http://www.geoext.org + 2011 + - - - - nexus.releases - Nexus SiceCat Releases - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ - - - - nexus.snapshots - Nexus SiceCat Snapshot - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ - - + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + - opengeo + org.osgeo openlayers-maven 1.0-SNAPSHOT jar @@ -86,106 +49,66 @@ - - javascript - - - - org.codehaus.mojo.javascript - javascript-maven-plugin - true - - - - war-package - - - - - - - - - - - opengeo - openlayers-maven - 1.0-SNAPSHOT - javascript - - - - - - release - - - - org.codehaus.mojo.javascript - javascript-maven-plugin - true - - - - war-package - prepare-tests - jsunit - compress - - - - - - - - - - - opengeo - openlayers-maven - 1.0-SNAPSHOT - javascript - - - - - - - - nexus.releases - Nexus Releases - http://nexus.emergya.es/nexus/content/groups/public/ - - - nexus.sicecat.releases - Nexus SiceCAT Releases - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ - - - - nexus.snapshots - Nexus SiceCAT Snapshot - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ - - false - - - true - - - - - codehaus.snapshot - Codehaus Snapshots - http://snapshots.repository.codehaus.org/ - - false - - - true - - - + + javascript + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + + org.osgeo + openlayers-maven + 1.0-SNAPSHOT + javascript + + + + + release + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + prepare-tests + jsunit + compress + + + + + + + + + + org.osgeo + openlayers-maven + 1.0-SNAPSHOT + javascript + + + + @@ -202,14 +125,12 @@ - codehaus.snapshot - Codehaus Snapshots - http://snapshots.repository.codehaus.org/ - + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ true - never diff --git a/src/maven/gxp-maven.xml b/src/maven/gxp-maven.xml index af193a04..785f7d67 100644 --- a/src/maven/gxp-maven.xml +++ b/src/maven/gxp-maven.xml @@ -1,65 +1,28 @@ 4.0.0 - opengeo + org.opengeo gxp-maven 1.0-SNAPSHOT javascript - - - BSD - https://github.com/opengeo/gxp/raw/master/license.txt - - - - GXP library extension - https://github.com/opengeo/gxp/raw/master/license.txt - - - - adiaz - Alejandro Díaz Torres - adiaz@emergya.com - Emergya Consultoría - http://www.emergya.es - - Analista - - - - - 2011 - - - - - - scm:git://github.com/opengeo/gxp/raw/master - scm:git://github.com/opengeo/gxp/raw/master - https://github.com/opengeo/gxp/raw/master - + GXP library extension + https://github.com/opengeo/gxp + 2011 + - - - - nexus.releases - Nexus SiceCat Releases - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ - - - - nexus.snapshots - Nexus SiceCat Snapshot - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ - - + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + - opengeo + org.geoext geoext-maven 1.0-SNAPSHOT jar @@ -86,106 +49,69 @@ - - javascript - - - - org.codehaus.mojo.javascript - javascript-maven-plugin - true - - - - war-package - - - - - - + + javascript + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + - - - - opengeo - geoext-maven - 1.0-SNAPSHOT - javascript - - - - - - release - - - - org.codehaus.mojo.javascript - javascript-maven-plugin - true - - - - war-package - prepare-tests - jsunit - compress - - - - - - + + + + org.geoext + geoext-maven + 1.0-SNAPSHOT + javascript + + + + + + release + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + prepare-tests + jsunit + compress + + + + + + - - - - opengeo - geoext-maven - 1.0-SNAPSHOT - javascript - - - - - - - - nexus.releases - Nexus Releases - http://nexus.emergya.es/nexus/content/groups/public/ - - - nexus.sicecat.releases - Nexus SiceCAT Releases - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ - - - - nexus.snapshots - Nexus SiceCAT Snapshot - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ - - false - - - true - - - - - codehaus.snapshot - Codehaus Snapshots - http://snapshots.repository.codehaus.org/ - - false - - - true - - - + + + + org.geoext + geoext-maven + 1.0-SNAPSHOT + javascript + + + + @@ -202,14 +128,12 @@ - codehaus.snapshot - Codehaus Snapshots - http://snapshots.repository.codehaus.org/ - + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ true - never diff --git a/src/maven/openlayers-maven.xml b/src/maven/openlayers-maven.xml index c80c10dc..f7ff4741 100644 --- a/src/maven/openlayers-maven.xml +++ b/src/maven/openlayers-maven.xml @@ -1,61 +1,24 @@ 4.0.0 - opengeo + org.osgeo openlayers-maven 1.0-SNAPSHOT javascript - - - BSD - https://github.com/opengeo/gxp/raw/master/license.txt - - - - Openlayers library - https://github.com/opengeo/gxp/raw/master/license.txt - - - - adiaz - Alejandro Díaz Torres - adiaz@emergya.com - Emergya Consultoría - http://www.emergya.es - - Analista - - - - - 2011 - - - - - - scm:git://github.com/opengeo/gxp/raw/master - scm:git://github.com/opengeo/gxp/raw/master - https://github.com/opengeo/gxp/raw/master - + Openlayers library + http://openlayers.org + 2011 + - - - - nexus.releases - Nexus SiceCat Releases - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ - - - - nexus.snapshots - Nexus SiceCat Snapshot - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ - - + + + scm:git://github.com/opengeo/gxp/raw/master + scm:git://github.com/opengeo/gxp/raw/master + https://github.com/opengeo/gxp/raw/master + target/scripts @@ -77,87 +40,49 @@ - - javascript - - - - org.codehaus.mojo.javascript - javascript-maven-plugin - true - - - - war-package - - - - - - - - - - release - - - - org.codehaus.mojo.javascript - javascript-maven-plugin - true - - - - war-package - prepare-tests - jsunit - compress - - - - - - - + + javascript + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + + + + + + + + + release + + + + org.codehaus.mojo.javascript + javascript-maven-plugin + true + + + + war-package + prepare-tests + jsunit + compress + + + + + + + - - - nexus.releases - Nexus Releases - http://nexus.emergya.es/nexus/content/groups/public/ - - - nexus.sicecat.releases - Nexus SiceCAT Releases - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo/ - - - - nexus.snapshots - Nexus SiceCAT Snapshot - http://nexus.emergya.es/nexus/content/repositories/sicecat-repo-snapshots/ - - false - - - true - - - - - codehaus.snapshot - Codehaus Snapshots - http://snapshots.repository.codehaus.org/ - - false - - - true - - - - @@ -173,14 +98,12 @@ - codehaus.snapshot - Codehaus Snapshots - http://snapshots.repository.codehaus.org/ - + codehaus.snapshot + Codehaus Snapshots + http://snapshots.repository.codehaus.org/ true - never