Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Uberfire07 #17

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Uberfire07 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d61cf70
Changes komodo dependency due to downgrade
mdrillin Apr 16, 2015
ed3c91e
Merge branch 'master' of git://github.com/Teiid-Designer/komodo-web
mdrillin May 11, 2015
a837dc6
uf 07 updates
mdrillin Jun 2, 2015
fb5c345
updates dependencies for uf07
mdrillin Jun 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 12 additions & 38 deletions komodoweb-deps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,21 @@
</description>

<properties>
<version.com.google.gwt>2.6.1</version.com.google.gwt>
<version.com.google.gwt>2.7.0</version.com.google.gwt>
<!--
gwt dnd should match the google gwt version. See matrix at
https://code.google.com/p/gwt-dnd/wiki/GettingStarted
-->
<version.com.allen-sauer.gwt.dnd>3.3.3</version.com.allen-sauer.gwt.dnd>
<version.org.jboss.integration-platform>6.0.0.CR13</version.org.jboss.integration-platform>
<version.org.jboss.errai>3.1.1.Final</version.org.jboss.errai>
<version.org.uberfire>0.6.0-SNAPSHOT</version.org.uberfire>
<version.org.uberfire.ext>0.6.0-SNAPSHOT</version.org.uberfire.ext>
<version.org.jboss.errai>3.2.0-SNAPSHOT</version.org.jboss.errai>
<version.org.uberfire>0.7.0-SNAPSHOT</version.org.uberfire>
<version.org.uberfire.ext>0.7.0-SNAPSHOT</version.org.uberfire.ext>
<version.org.jboss.teiid>8.7.0.Final</version.org.jboss.teiid>
<version.org.komodo>0.0.1-SNAPSHOT</version.org.komodo>
<version.jboss>8.0.0.Final</version.jboss>
<jbossas-version>${version.jboss}</jbossas-version>
<version.org.mortbay.jetty>6.1.25</version.org.mortbay.jetty>
<version.org.infinispan>6.0.2.Final</version.org.infinispan>
<version.org.owasp.encoder>1.1.1</version.org.owasp.encoder>
<version.com.github.gwtd3>1.1.1</version.com.github.gwtd3>

<!-- temporary: makes the enforcerRule (illegal-transitive-dependency-check) not to break the build -->
Expand Down Expand Up @@ -82,21 +80,18 @@
<!-- Errai -->
<dependency>
<groupId>org.jboss.errai.bom</groupId>
<artifactId>errai-bom</artifactId>
<artifactId>errai-internal-bom</artifactId>
<version>${version.org.jboss.errai}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-security-client</artifactId>
<version>${version.org.jboss.errai}</version>
</dependency>
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-security-picketlink</artifactId>
<version>${version.org.jboss.errai}</version>
</dependency>

<!-- Errai dependency for CDI 1.0 Compat -->
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-weld-integration</artifactId>
<version>3.0.4.Final</version>
</dependency>

<!-- GWT and GWT Extensions -->
<dependency>
Expand Down Expand Up @@ -186,27 +181,6 @@
<version>${version.org.owasp.encoder}</version>
</dependency>

<!-- CDI Development Utils -->
<!-- This must be placed above com.google.gwt:gwt-dev to override the
Jetty that is present there -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>${version.org.mortbay.jetty}</version>
</dependency>

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>${version.org.mortbay.jetty}</version>
</dependency>

<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-naming</artifactId>
<version>${version.org.mortbay.jetty}</version>
</dependency>

<dependency>
<groupId>com.github.gwtd3</groupId>
<artifactId>gwt-d3-api</artifactId>
Expand Down
188 changes: 145 additions & 43 deletions komodoweb-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,73 @@
<artifactId>guice</artifactId>
</dependency>

<!-- Upload -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>

<!-- UberFire -->
<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-all</artifactId>
<artifactId>uberfire-api</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-io</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-server</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-backend-server</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-backend-cdi</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-nio2-fs</artifactId>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-js</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-workbench-client</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-client-backend</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-client-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-workbench-processors</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.uberfire</groupId>
<artifactId>uberfire-security-client</artifactId>
Expand Down Expand Up @@ -122,18 +177,6 @@
</dependency>

<!-- Third party libraries -->
<dependency>
<groupId>org.owasp.encoder</groupId>
<artifactId>encoder</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</dependency>
<dependency>
<groupId>com.github.gwtd3</groupId>
<artifactId>gwt-d3-api</artifactId>
Expand Down Expand Up @@ -164,36 +207,78 @@
<groupId>org.jboss.errai</groupId>
<artifactId>errai-security-picketlink</artifactId>
</dependency>

<!-- All of these libraries are supplied by the app server and must not be deployed with the WAR file! -->
<dependency><groupId>javax.enterprise</groupId><artifactId>cdi-api</artifactId><scope>provided</scope></dependency>
<dependency><groupId>javax.inject</groupId><artifactId>javax.inject</artifactId><scope>provided</scope></dependency>
<dependency><groupId>javax.validation</groupId><artifactId>validation-api</artifactId><scope>provided</scope></dependency>
<dependency><groupId>junit</groupId><artifactId>junit</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.hibernate.common</groupId><artifactId>hibernate-commons-annotations</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.hibernate.javax.persistence</groupId><artifactId>hibernate-jpa-2.0-api</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.hibernate</groupId><artifactId>hibernate-core</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.hibernate</groupId><artifactId>hibernate-entitymanager</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.hibernate</groupId><artifactId>hibernate-validator</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-cdi-jboss</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-cdi-jetty</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-codegen-gwt</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-ioc-bus-support</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-javax-enterprise</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-jaxrs-client</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-jpa-client</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-navigation</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.errai</groupId><artifactId>errai-tools</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.resteasy</groupId><artifactId>jaxrs-api</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.resteasy</groupId><artifactId>resteasy-cdi</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.spec.javax.interceptor</groupId><artifactId>jboss-interceptors-api_1.1_spec</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.spec.javax.transaction</groupId><artifactId>jboss-transaction-api_1.1_spec</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.weld.servlet</groupId><artifactId>weld-servlet-core</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.weld</groupId><artifactId>weld-api</artifactId><scope>provided</scope></dependency>
<dependency><groupId>org.jboss.weld</groupId><artifactId>weld-spi</artifactId><scope>provided</scope></dependency>
<dependency><groupId>xml-apis</groupId><artifactId>xml-apis</artifactId><scope>provided</scope></dependency>
<dependency><groupId>com.sun.xml.bind</groupId><artifactId>jaxb-impl</artifactId><scope>provided</scope></dependency>

<!-- Weld Modules -->
<dependency>
<groupId>org.jboss.weld.se</groupId>
<artifactId>weld-se-core</artifactId>
<scope>provided</scope>
</dependency>


<!-- Log -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-ext</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
</dependency>

<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>

<!-- Cleanup WAR -->
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>de.benediktmeurer.gwt-slf4j</groupId>
<artifactId>gwt-slf4j</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<scope>provided</scope>
</dependency>

<!-- GWT -->
<dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-user</artifactId>
<scope>provided</scope>
</dependency>

</dependencies>

<build>
Expand Down Expand Up @@ -321,6 +406,23 @@
<compileSourcesArtifact>org.modeshape:modeshape-sequencer-teiid</compileSourcesArtifact>
<compileSourcesArtifact>org.modeshape:modeshape-sequencer-ddl</compileSourcesArtifact>
<compileSourcesArtifact>org.jboss.tools.komodo.plugins:org.komodo.modeshape.teiid.sql.sequencer</compileSourcesArtifact>
<!-- UberFire -->
<compileSourcesArtifact>org.uberfire:uberfire-commons</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-nio2-model</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-io</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-api</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-js</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-security-api</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-security-client</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-client-api</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-workbench-client</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-workbench-client-backend</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-workbench-client-views-patternfly</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-backend-api</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-server</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-backend-server</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-backend-cdi</compileSourcesArtifact>
<compileSourcesArtifact>org.uberfire:uberfire-nio2-fs</compileSourcesArtifact>
</compileSourcesArtifacts>

<!-- do not insert line breaks in this string; it breaks Windows compatibility -->
Expand Down
4 changes: 3 additions & 1 deletion komodoweb-webapp/src/main/java/org/komodo/web/backend/server/services/KomodoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.logging.Level;

import org.jboss.errai.bus.server.annotations.Service;
import org.komodo.core.KEngine;
import org.komodo.relational.vdb.Vdb;
Expand Down Expand Up @@ -264,7 +266,7 @@ public String getVdbDDL(final String vdbPath) throws KomodoUiException {
for(Vdb vdb : vdbs) {
String thePath = vdb.getAbsolutePath();
if(thePath.equals(vdbPath)) {
vdbDdl = ((VdbImpl)vdb).export(null);
vdbDdl = ((VdbImpl)vdb).export(null, new Properties());
}
}
} catch (KException e) {
Expand Down
2 changes: 1 addition & 1 deletion komodoweb-webapp/src/main/resources/ErraiApp.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# https://github.com/errai/errai/blob/master/errai-docs/src/main/asciidoc/reference.asciidoc#erraiappproperties
# for details.

errai.security.user_cookie_enabled=true
errai.security.user_on_hostpage_enabled=true
25 changes: 0 additions & 25 deletions komodoweb-webapp/src/main/resources/app.html.template
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions komodoweb-webapp/src/main/resources/org/komodo/FastCompiledKomodoWebApp.gwt.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,20 @@
<inherits name="org.jboss.errai.ui.nav.Navigation"/>

<inherits name="com.google.gwt.logging.Logging"/>
<set-property name="gwt.logging.firebugHandler" value="ENABLED" />
<set-property name="gwt.logging.developmentModeHandler" value="ENABLED" />
<set-property name="gwt.logging.simpleRemoteHandler" value="DISABLED" />
<set-property name="gwt.logging.enabled" value="TRUE"/>
<set-property name="gwt.logging.logLevel" value="FINEST" />
<set-property name="gwt.logging.consoleHandler" value="ENABLED" />
<set-property name="gwt.logging.popupHandler" value="DISABLED" />
<set-property name="gwt.logging.systemHandler" value="ENABLED" />

<inherits name='com.github.gwtd3.D3' />

<inherits name="org.komodo.KomodoSpi"/>
<inherits name="org.modeshape.sequencer.teiid.TeiidSequencer"/>
<inherits name="org.modeshape.sequencer.DdlSequencer"/>
<inherits name="org.modeshape.sequencer.teiid.TeiidSqlSequencer"/>

<set-property name="gwt.logging.popupHandler" value="DISABLED"/>

<set-property name="user.agent" value="gecko1_8,safari"/>
<set-property name="locale" value="default"/>

Expand Down
Loading