svn commit: r1456376 - /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
Author: coheigea
Date: Thu Mar 14 09:47:28 2013
New Revision: 1456376
URL: http://svn.apache.org/r1456376
Log:
Widen the window for Schema Attributes so that the JEXL question mark appears
on the same row
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1456376r1=1456375r2=1456376view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java
Thu Mar 14 09:47:28 2013
@@ -93,7 +93,7 @@ public class Schema extends BasePage {
};
-private static final int WIN_WIDTH = 550;
+private static final int WIN_WIDTH = 600;
private static final int WIN_HEIGHT = 200;
svn commit: r1456410 [1/2] - in /syncope/trunk/console/src/main/webapp: css/jquery-ui.css scripts/jquery-ui.js
Author: ilgrosso
Date: Thu Mar 14 12:59:33 2013
New Revision: 1456410
URL: http://svn.apache.org/r1456410
Log:
Upgrade JQUery-UI to 1.10.1, both JS and CSS thus solving display issues in the
Schema tab
Modified:
syncope/trunk/console/src/main/webapp/css/jquery-ui.css
syncope/trunk/console/src/main/webapp/scripts/jquery-ui.js
Modified: syncope/trunk/console/src/main/webapp/css/jquery-ui.css
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/jquery-ui.css?rev=1456410r1=1456409r2=1456410view=diff
==
--- syncope/trunk/console/src/main/webapp/css/jquery-ui.css (original)
+++ syncope/trunk/console/src/main/webapp/css/jquery-ui.css Thu Mar 14 12:59:33
2013
@@ -1,474 +1,5 @@
-/*! jQuery UI - v1.9.2 - 2012-11-23
+/*! jQuery UI - v1.10.1 - 2013-02-15
* http://jqueryui.com
* Includes: jquery.ui.core.css, jquery.ui.accordion.css,
jquery.ui.autocomplete.css, jquery.ui.button.css, jquery.ui.datepicker.css,
jquery.ui.dialog.css, jquery.ui.menu.css, jquery.ui.progressbar.css,
jquery.ui.resizable.css, jquery.ui.selectable.css, jquery.ui.slider.css,
jquery.ui.spinner.css, jquery.ui.tabs.css, jquery.ui.tooltip.css,
jquery.ui.theme.css
-* Copyright 2012 jQuery Foundation and other contributors; Licensed MIT */
-
-/* Layout helpers
---*/
-.ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { border: 0; clip: rect(0 0 0 0); height: 1px;
margin: -1px; overflow: hidden; padding: 0; position: absolute; width: 1px; }
-.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height:
1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ; display:
table; }
-.ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
-.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position:
absolute; opacity: 0; filter:Alpha(Opacity=0); }
-
-
-/* Interaction Cues
---*/
-.ui-state-disabled { cursor: default !important; }
-
-
-/* Icons
---*/
-
-/* states and images */
-.ui-icon { display: block; text-indent: -9px; overflow: hidden;
background-repeat: no-repeat; }
-
-
-/* Misc visuals
---*/
-
-/* Overlays */
-.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height:
100%; }
-
-.ui-accordion .ui-accordion-header { display: block; cursor: pointer;
position: relative; margin-top: 2px; padding: .5em .5em .5em .7em; zoom: 1; }
-.ui-accordion .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-noicons { padding-left: .7em; }
-.ui-accordion .ui-accordion-icons .ui-accordion-icons { padding-left: 2.2em; }
-.ui-accordion .ui-accordion-header .ui-accordion-header-icon { position:
absolute; left: .5em; top: 50%; margin-top: -8px; }
-.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0;
overflow: auto; zoom: 1; }
-
-.ui-autocomplete {
- position: absolute;
- top: 0;
- left: 0;
- cursor: default;
-}
-
-/* workarounds */
-* html .ui-autocomplete { width:1px; } /* without this, the menu expands to
100% in IE6 */
-
-.ui-button { display: inline-block; position: relative; padding: 0;
margin-right: .1em; cursor: pointer; text-align: center; zoom: 1; overflow:
visible; } /* the overflow property removes extra width in IE */
-.ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover,
.ui-button:active { text-decoration: none; }
-.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width
needs to be set here */
-button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a
little more width */
-.ui-button-icons-only { width: 3.4em; }
-button.ui-button-icons-only { width: 3.7em; }
-
-/*button text element */
-.ui-button .ui-button-text { display: block; line-height: 1.4; }
-.ui-button-text-only .ui-button-text { padding: .4em 1em; }
-.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text {
padding: .4em; text-indent: -999px; }
-.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons
.ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons
.ui-button-text { padding: .4em 2.1em .4em 1em; }
-.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right:
2.1em; }
-/* no icon support for input elements, provide padding by default */
-input.ui-button { padding: .4em 1em; }
-
-/*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon,
.ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon,
.ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top:
-8px; }
-.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon-primary
svn commit: r1456529 - in /syncope/trunk: client/src/main/java/org/apache/syncope/client/services/proxy/ common/src/main/java/org/apache/syncope/common/services/ console/src/main/java/org/apache/synco
Author: fmartelli
Date: Thu Mar 14 16:51:13 2013
New Revision: 1456529
URL: http://svn.apache.org/r1456529
Log:
SYNCOPE-198: provided table implementation and bulk actions for resources and
connectors
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConnectorServiceProxy.java
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ResourceService.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AjaxDataTablePanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ConnectorRestClient.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/ResourceRestClient.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources.html
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ConnInstanceController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/ResourceController.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ConnectorServiceImpl.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/services/ResourceServiceImpl.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ConnInstanceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/ResourceTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConnectorServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConnectorServiceProxy.java?rev=1456529r1=1456528r2=1456529view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConnectorServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ConnectorServiceProxy.java
Thu Mar 14 16:51:13 2013
@@ -24,6 +24,8 @@ import java.util.Arrays;
import java.util.List;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.services.ConnectorService;
+import org.apache.syncope.common.to.BulkAction;
+import org.apache.syncope.common.to.BulkActionRes;
import org.apache.syncope.common.to.ConnBundleTO;
import org.apache.syncope.common.to.ConnInstanceTO;
import org.apache.syncope.common.to.SchemaTO;
@@ -119,4 +121,9 @@ public class ConnectorServiceProxy exten
public void reload() {
getRestTemplate().postForLocation(baseUrl + connector/reload, null);
}
+
+@Override
+public BulkActionRes bulkAction(final BulkAction bulkAction) {
+return getRestTemplate().postForObject(baseUrl + connector/bulk,
bulkAction, BulkActionRes.class);
+}
}
Modified:
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java?rev=1456529r1=1456528r2=1456529view=diff
==
---
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
(original)
+++
syncope/trunk/client/src/main/java/org/apache/syncope/client/services/proxy/ResourceServiceProxy.java
Thu Mar 14 16:51:13 2013
@@ -31,6 +31,8 @@ import javax.ws.rs.core.Response;
import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.common.services.ResourceService;
+import org.apache.syncope.common.to.BulkAction;
+import org.apache.syncope.common.to.BulkActionRes;
import org.apache.syncope.common.to.ConnObjectTO;
import org.apache.syncope.common.to.PropagationActionClassTO;
import org.apache.syncope.common.to.ResourceTO;
@@ -110,4 +112,9 @@ public class ResourceServiceProxy extend
return getRestTemplate().postForObject(baseUrl +
resource/check.json, resourceTO, Boolean.class).
booleanValue();
}
+
+@Override
+public BulkActionRes bulkAction(final BulkAction bulkAction) {
+return getRestTemplate().postForObject(baseUrl + resource/bulk,
bulkAction, BulkActionRes.class);
+}
}
Modified:
syncope/trunk/common/src/main/java/org/apache/syncope/common/services/ConnectorService.java
URL:
svn commit: r1456598 - /syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Author: ilgrosso
Date: Thu Mar 14 18:28:10 2013
New Revision: 1456598
URL: http://svn.apache.org/r1456598
Log:
Removing usage of deprecated method
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java?rev=1456598r1=1456597r2=1456598view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
Thu Mar 14 18:28:10 2013
@@ -641,7 +641,8 @@ public class UserTestITCase extends Abst
Exception exception = null;
try {
-jdbcTemplate.queryForInt(SELECT id FROM test WHERE id=?,
userTO.getUsername());
+jdbcTemplate.queryForObject(SELECT id FROM test WHERE id=?,
+new String[]{userTO.getUsername()}, Integer.class);
} catch (EmptyResultDataAccessException e) {
exception = e;
}
svn commit: r1456601 - in /syncope/trunk: core/pom.xml core/src/test/resources/jboss/META-INF/ core/src/test/resources/jboss/META-INF/MANIFEST.MF pom.xml
Author: ilgrosso
Date: Thu Mar 14 18:29:59 2013
New Revision: 1456601
URL: http://svn.apache.org/r1456601
Log:
Glassfish and JBoss verified - note that for JBoss the OSGi stuff needs to be
disabled until SYNCOPE-204
Added:
syncope/trunk/core/src/test/resources/jboss/META-INF/
syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF
Modified:
syncope/trunk/core/pom.xml
syncope/trunk/pom.xml
Modified: syncope/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1456601r1=1456600r2=1456601view=diff
==
--- syncope/trunk/core/pom.xml (original)
+++ syncope/trunk/core/pom.xml Thu Mar 14 18:29:59 2013
@@ -1069,7 +1069,7 @@ under the License.
profile
idglassfish-it/id
-
+
dependencies
dependency
groupIdcom.h2database/groupId
@@ -1113,7 +1113,7 @@ under the License.
profile
idjboss-it/id
-
+
dependencies
dependency
groupIdcom.h2database/groupId
@@ -1134,7 +1134,46 @@ under the License.
skipTeststrue/skipTests
/configuration
/plugin
-
+
+ !-- Disable MANIFEST.MF OSGi handling --
+ plugin
+groupIdorg.apache.felix/groupId
+artifactIdmaven-bundle-plugin/artifactId
+executions
+ execution
+idbundle-manifest/id
+phasenone/phase
+ /execution
+/executions
+ /plugin
+
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-antrun-plugin/artifactId
+inheritedtrue/inherited
+executions
+ execution
+idsetupBuildToolsForJBoss/id
+phasepre-integration-test/phase
+configuration
+ target
+unzip
src=${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war
+
dest=${project.build.directory}/syncope-build-tools-test/
+copy
file=${project.build.outputDirectory}/META-INF/MANIFEST.MF
+
todir=${project.build.directory}/syncope-build-tools-test/META-INF
+ overwrite=true/
+copy
file=${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar
+
todir=${project.build.directory}/syncope-build-tools-test/WEB-INF/lib
+ overwrite=true/
+ /target
+/configuration
+goals
+ goalrun/goal
+/goals
+ /execution
+/executions
+ /plugin
+
plugin
groupIdorg.codehaus.cargo/groupId
artifactIdcargo-maven2-plugin/artifactId
@@ -1155,7 +1194,31 @@ under the License.
cargo.jvmargs-Xms1024m -Xmx2048m -XX:PermSize=512m
-XX:MaxPermSize=1024m -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled
-XX:+CMSClassUnloadingEnabled/cargo.jvmargs
/properties
/configuration
-/configuration
+ deployables
+deployable
+ location${cargo.run.dir}/location
+
pingURLhttp://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml/pingURL
+ pingTimeout120/pingTimeout
+ properties
+contextsyncope/context
+ /properties
+/deployable
+deployable
+ groupIdorg.connid.bundles.soap/groupId
+ artifactIdwssample/artifactId
+ typewar/type
+ properties
+contextwssample/context
+ /properties
+/deployable
+deployable
+
location${project.build.directory}/syncope-build-tools-test/location
+ properties
+contextsyncope-build-tools/context
+ /properties
+/deployable
+ /deployables
+/configuration
/plugin
/plugins
@@ -1171,9 +1234,6 @@ under the License.
resource
directorysrc/test/resources/jboss/directory
filteringtrue/filtering
-includes
- includepersistenceContextEMFactory.xml/include
-/includes
/resource
resource
directorysrc/test/resources/directory
Added: syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF?rev=1456601view=auto
