Permalink
Browse files

cleanups

moved frontend app sources to new directory
configured maven build to execute qooxdoo build script in appropriate phase
  • Loading branch information...
1 parent e45216e commit ebd40b7a95f950c3e6fa88a786076cc0fbde8b19 tomek committed Jul 13, 2012
Showing with 183 additions and 198 deletions.
  1. +2 −1 .gitignore
  2. +55 −10 pom.xml
  3. +34 −0 src/main/frontend/Manifest.json
  4. +58 −0 src/main/frontend/config.json
  5. 0 src/main/{webapp/helenos → frontend}/generate.py
  6. +3 −3 src/main/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/Application.js
  7. +1 −1 src/main/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/__init__.js
  8. +2 −2 ...webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/components/MainPane.js
  9. +1 −1 .../helenos/source/class/com/kuprowski → frontend/source/class}/helenos/simulation/DemoSimulation.js
  10. +1 −1 ...main/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/test/DemoTest.js
  11. +1 −1 ...n/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/theme/Appearance.js
  12. +1 −1 src/main/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/theme/Color.js
  13. +1 −1 ...n/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/theme/Decoration.js
  14. +1 −1 src/main/{webapp/helenos/source/class/com/kuprowski → frontend/source/class}/helenos/theme/Font.js
  15. +21 −0 src/main/frontend/source/class/helenos/theme/Theme.js
  16. +1 −1 src/main/{webapp/helenos → frontend}/source/index.html
  17. 0 src/main/{webapp/helenos/source/resource/com/kuprowski → frontend/source/resource}/helenos/test.png
  18. +0 −34 src/main/webapp/helenos/Manifest.json
  19. +0 −85 src/main/webapp/helenos/config.json
  20. +0 −11 src/main/webapp/helenos/readme.txt
  21. +0 −21 src/main/webapp/helenos/source/class/com/kuprowski/helenos/theme/Theme.js
  22. +0 −20 src/main/webapp/helenos/source/script/com.kuprowski.helenos.js
  23. +0 −3 src/main/webapp/helenos/source/translation/readme.txt
View
3 .gitignore
@@ -1,3 +1,4 @@
/target/
/src/main/webapp/helenos/build/
-/src/main/webapp/helenos/source/script/
+/src/main/webapp/helenos/source/script/
+/src/main/frontend/build/
View
65 pom.xml
@@ -34,13 +34,6 @@
<version>1.0</version>
<scope>runtime</scope>
</dependency>
- <!--
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
- </dependency>
- -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jcl</artifactId>
@@ -88,8 +81,6 @@
</goals>
<configuration>
<outputDirectory>${webappDirectory}/WEB-INF/lib</outputDirectory>
- <!--<includeScope>provided</includeScope>-->
-
</configuration>
</execution>
</executions>
@@ -169,7 +160,6 @@
<version>3.0.1</version>
<scope>runtime</scope>
</dependency>
- <!-- koniec extra dodawania -->
<dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all</artifactId>
@@ -179,11 +169,45 @@
</dependencies>
</plugin>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>clean-frontend</id>
+ <phase>clean</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>python</executable>
+ <workingDirectory>src/main/frontend</workingDirectory>
+ <commandlineArgs>generate.py clean</commandlineArgs>
+ </configuration>
+ </execution>
+ <execution>
+ <id>build-frontend</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>python</executable>
+ <workingDirectory>src/main/frontend</workingDirectory>
+ <commandlineArgs>generate.py build</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.4.3</version>
<executions>
<execution>
+ <id>copy-webapp-resources</id>
<phase>compile</phase>
<goals>
<goal>copy-resources</goal>
@@ -203,6 +227,27 @@
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-frontend-resources</id>
+ <phase>build-frontend</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${webappDirectory}/helenos</outputDirectory>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <includeEmptyDirs>true</includeEmptyDirs>
+ <overwrite>true</overwrite>
+ <resources>
+ <resource>
+ <directory>src/main/frontend/build</directory>
+ <includes>
+ <include>**/*.*</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
View
34 src/main/frontend/Manifest.json
@@ -0,0 +1,34 @@
+{
+ "info" :
+ {
+ "name" : "helenos",
+
+ "summary" : "Helenos - Cassandra web console",
+ "description" : "Web application to manage your data stored in Cassandra",
+
+ "homepage" : "http://tomekkup.github.com/helenos/",
+
+ "license" : "GPLv2: http://www.gnu.org/licences/gpl.html",
+ "authors" :
+ [
+ {
+ "name" : "Tomek Kuprowski",
+ "email" : "tomekkuprowski@gmail.com"
+ }
+ ],
+
+ "version" : "trunk",
+ "qooxdoo-versions": ["2.0.1"]
+ },
+
+ "provides" :
+ {
+ "namespace" : "helenos",
+ "encoding" : "utf-8",
+ "class" : "source/class",
+ "resource" : "source/resource",
+ "translation" : "source/translation",
+ "type" : "application"
+ }
+}
+
View
58 src/main/frontend/config.json
@@ -0,0 +1,58 @@
+{
+ "name" : "helenos",
+
+ "include" :
+ [
+ {
+ "path" : "${QOOXDOO_PATH}/tool/data/config/application.json"
+ }
+ ],
+
+ "export" :
+ [
+ "api",
+ "api-data",
+ "build",
+ "clean",
+ "distclean",
+ "fix",
+ "info",
+ "inspector",
+ "lint",
+ "migration",
+ "pretty",
+ "profiling",
+ "source",
+ "source-all",
+ "source-hybrid",
+ "simulation-build",
+ "simulation-run",
+ "test",
+ "test-source",
+ "translation"
+ ],
+
+ "default-job" : "source-hybrid",
+
+ "let" :
+ {
+ "APPLICATION" : "helenos",
+ "QOOXDOO_PATH" : "../../../../../../tools/qooxdoo",
+ "QXTHEME" : "helenos.theme.Theme",
+ "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"],
+ "LOCALES" : [ "en" ],
+ "CACHE" : "${TMPDIR}/qx${QOOXDOO_VERSION}/cache",
+ "ROOT" : "."
+ },
+
+ "jobs" :
+ {
+ "libraries" :
+ {
+ "library" :
+ [
+
+ ]
+ }
+ }
+}
View
0 src/main/webapp/helenos/generate.py → src/main/frontend/generate.py
File renamed without changes.
View
6 ...lass/com/kuprowski/helenos/Application.js → ...ntend/source/class/helenos/Application.js
@@ -10,14 +10,14 @@
/* ************************************************************************
-#asset(com/kuprowski/helenos/*)
+#asset(helenos/*)
************************************************************************ */
/**
* This is the main application class of your custom application "helenos"
*/
-qx.Class.define("com.kuprowski.helenos.Application",
+qx.Class.define("helenos.Application",
{
extend : qx.application.Standalone,
@@ -54,7 +54,7 @@ qx.Class.define("com.kuprowski.helenos.Application",
// Document is the application root
var doc = this.getRoot();
- var pane = new com.kuprowski.helenos.components.MainPane;
+ var pane = new helenos.components.MainPane;
doc.add(pane, {left: 100, top: 50});
}
}
View
2 ...e/class/com/kuprowski/helenos/__init__.js → ...frontend/source/class/helenos/__init__.js
@@ -1,4 +1,4 @@
-/** <h3> com.kuprowski.helenos API Documentation </h3>
+/** <h3> helenos API Documentation </h3>
*
* Replace this text with an appropriate overview and introduction to your
* application.
View
4 .../kuprowski/helenos/components/MainPane.js → ...urce/class/helenos/components/MainPane.js
@@ -10,14 +10,14 @@
/* ************************************************************************
-#asset(com/kuprowski/helenos/*)
+#asset(helenos/*)
************************************************************************ */
/**
* This is the main application class of your custom application "helenos"
*/
-qx.Class.define("com.kuprowski.helenos.components.MainPane",
+qx.Class.define("helenos.components.MainPane",
{
extend : qx.ui.splitpane.Pane,
View
2 ...wski/helenos/simulation/DemoSimulation.js → ...lass/helenos/simulation/DemoSimulation.js
@@ -15,7 +15,7 @@
*
* @lint ignoreUndefined(simulator)
*/
-qx.Class.define("com.kuprowski.helenos.simulation.DemoSimulation", {
+qx.Class.define("helenos.simulation.DemoSimulation", {
extend : simulator.unit.TestCase,
View
2 ...ss/com/kuprowski/helenos/test/DemoTest.js → ...end/source/class/helenos/test/DemoTest.js
@@ -20,7 +20,7 @@
* i.e. using deeper namespaces and a corresponding file structure within the
* <tt>test</tt> folder.
*/
-qx.Class.define("com.kuprowski.helenos.test.DemoTest",
+qx.Class.define("helenos.test.DemoTest",
{
extend : qx.dev.unit.TestCase,
View
2 ...com/kuprowski/helenos/theme/Appearance.js → .../source/class/helenos/theme/Appearance.js
@@ -8,7 +8,7 @@
************************************************************************ */
-qx.Theme.define("com.kuprowski.helenos.theme.Appearance",
+qx.Theme.define("helenos.theme.Appearance",
{
extend : qx.theme.modern.Appearance,
View
2 ...lass/com/kuprowski/helenos/theme/Color.js → ...ntend/source/class/helenos/theme/Color.js
@@ -8,7 +8,7 @@
************************************************************************ */
-qx.Theme.define("com.kuprowski.helenos.theme.Color",
+qx.Theme.define("helenos.theme.Color",
{
extend : qx.theme.modern.Color,
View
2 ...com/kuprowski/helenos/theme/Decoration.js → .../source/class/helenos/theme/Decoration.js
@@ -8,7 +8,7 @@
************************************************************************ */
-qx.Theme.define("com.kuprowski.helenos.theme.Decoration",
+qx.Theme.define("helenos.theme.Decoration",
{
extend : qx.theme.modern.Decoration,
View
2 ...class/com/kuprowski/helenos/theme/Font.js → ...ontend/source/class/helenos/theme/Font.js
@@ -8,7 +8,7 @@
************************************************************************ */
-qx.Theme.define("com.kuprowski.helenos.theme.Font",
+qx.Theme.define("helenos.theme.Font",
{
extend : qx.theme.modern.Font,
View
21 src/main/frontend/source/class/helenos/theme/Theme.js
@@ -0,0 +1,21 @@
+/* ************************************************************************
+
+ Copyright:
+
+ License:
+
+ Authors:
+
+************************************************************************ */
+
+qx.Theme.define("helenos.theme.Theme",
+{
+ meta :
+ {
+ color : helenos.theme.Color,
+ decoration : helenos.theme.Decoration,
+ font : helenos.theme.Font,
+ icon : qx.theme.icon.Tango,
+ appearance : helenos.theme.Appearance
+ }
+});
View
2 src/main/webapp/helenos/source/index.html → src/main/frontend/source/index.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>helenos</title>
- <script type="text/javascript" src="script/com.kuprowski.helenos.js"></script>
+ <script type="text/javascript" src="script/helenos.js"></script>
</head>
<body></body>
</html>
View
0 ...e/resource/com/kuprowski/helenos/test.png → ...frontend/source/resource/helenos/test.png
File renamed without changes
View
34 src/main/webapp/helenos/Manifest.json
@@ -1,34 +0,0 @@
-{
- "info" :
- {
- "name" : "helenos",
-
- "summary" : "Custom Application",
- "description" : "This is a skeleton for a custom application with qooxdoo.",
-
- "homepage" : "http://some.homepage.url/",
-
- "license" : "SomeLicense",
- "authors" :
- [
- {
- "name" : "Tomek Kuprowski",
- "email" : "first.author@some.domain"
- }
- ],
-
- "version" : "trunk",
- "qooxdoo-versions": ["2.0.1"]
- },
-
- "provides" :
- {
- "namespace" : "com.kuprowski.helenos",
- "encoding" : "utf-8",
- "class" : "source/class",
- "resource" : "source/resource",
- "translation" : "source/translation",
- "type" : "application"
- }
-}
-
View
85 src/main/webapp/helenos/config.json
@@ -1,85 +0,0 @@
-{
- "name" : "helenos",
-
- "include" :
- [
- {
- "path" : "${QOOXDOO_PATH}/tool/data/config/application.json"
- }
- ],
-
- "export" :
- [
- "api",
- "api-data",
- "build",
- "clean",
- "distclean",
- "fix",
- "info",
- "inspector",
- "lint",
- "migration",
- "pretty",
- "profiling",
- "source",
- "source-all",
- "source-hybrid",
- "simulation-build",
- "simulation-run",
- "test",
- "test-source",
- "translation"
- ],
-
- "default-job" : "source-hybrid",
-
- "let" :
- {
- "APPLICATION" : "com.kuprowski.helenos",
- "QOOXDOO_PATH" : "../../../../../../tools/qooxdoo",
- "QXTHEME" : "com.kuprowski.helenos.theme.Theme",
- "API_EXCLUDE" : ["qx.test.*", "${APPLICATION}.theme.*", "${APPLICATION}.test.*", "${APPLICATION}.simulation.*"],
- "LOCALES" : [ "en" ],
- "CACHE" : "${TMPDIR}/qx${QOOXDOO_VERSION}/cache",
- "ROOT" : "."
- },
-
- // You only need to edit the remainder of this file, if you want to customize
- // specific jobs, or add own job definitions.
-
- "jobs" :
- {
- // Uncomment the following entry to add a contrib or library to your
- // project; make sure to adapt the path to the Manifest.json; if you are
- // using a contrib: library, it will be downloaded into the path specified
- // by the 'cache/downloads' config key
- /*
- "libraries" :
- {
- "library" :
- [
- {
- "manifest" : "contrib://SkeletonApplication/trunk/Manifest.json"
- }
- ]
- }
- */
-
- // If you want to tweak a job setting, see the following sample where
- // the "format" feature of the "build-script" job is overridden.
- // To see a list of available jobs, invoke 'generate.py x'.
- /*
- ,"build-script" :
- {
- "compile-options" :
- {
- "code" :
- {
- "format" : false
- }
- }
- }
- */
- }
-}
View
11 src/main/webapp/helenos/readme.txt
@@ -1,11 +0,0 @@
-Desktop Skeleton - A qooxdoo Application Template
-==================================================
-
-This is a qooxdoo application skeleton which is used as a template. The
-'create-application.py' script (usually under tool/bin/create-application.py)
-will use this and expand it into a self-contained qooxdoo application which
-can then be further extended. Please refer to the script and other documentation
-for further information.
-
-short:: is a standard qooxdoo GUI application
-copy_file:: tool/data/generator/needs_generation.js source/script/custom.js
View
21 src/main/webapp/helenos/source/class/com/kuprowski/helenos/theme/Theme.js
@@ -1,21 +0,0 @@
-/* ************************************************************************
-
- Copyright:
-
- License:
-
- Authors:
-
-************************************************************************ */
-
-qx.Theme.define("com.kuprowski.helenos.theme.Theme",
-{
- meta :
- {
- color : com.kuprowski.helenos.theme.Color,
- decoration : com.kuprowski.helenos.theme.Decoration,
- font : com.kuprowski.helenos.theme.Font,
- icon : qx.theme.icon.Tango,
- appearance : com.kuprowski.helenos.theme.Appearance
- }
-});
View
20 src/main/webapp/helenos/source/script/com.kuprowski.helenos.js
@@ -1,20 +0,0 @@
-/*
- * This is mock content and will be overwritten with the first 'generate.py source'.
- */
-function inform(){
- var message =
- "<div style='font-family: Verdana'>" +
- "<h2>Application not yet ready!</h2>" +
- "<div>Please use the generator to build this application, i.e. run <i>'generate.py'</i> in an OS shell, in the application folder; then reload this page.</div>" +
- "</div>";
-
- window.setTimeout(function() {
- document.body.innerHTML = message;
- }, 0);
-}
-
-if (window.attachEvent) {
- window.attachEvent("onload", inform);
-} else {
- window.addEventListener("load", inform, false);
-}
View
3 src/main/webapp/helenos/source/translation/readme.txt
@@ -1,3 +0,0 @@
-This directory will contain translation (.po) files once you run the
-'translation' job in your project.
-

0 comments on commit ebd40b7

Please sign in to comment.