[prev in list] [next in list] [prev in thread] [next in thread]
List: forgerock-openicf-commit
Subject: [Commitopenicf] [6515] trunk/connectors/java/scriptedcommon: OPENICF-185 ?\226?\128? \147 Update the
From: anonymous () forgerock ! org
Date: 2014-04-17 15:53:32
Message-ID: 20140417155332.5E31240994 () sources ! internal ! forgerock ! com
[Download RAW message or body]
[Attachment #2 (text/html)]
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6515] trunk/connectors/java/scriptedcommon: OPENICF-185 ?\226?\128?\147 \
Update the test to use different port</title> </head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: \
verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: \
bold} #msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: \
bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: \
6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em \
0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg \
h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } \
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; \
} #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: \
-1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em \
1em 0 1em; background: white;} #logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid \
#fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { \
text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted \
#fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: \
0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid \
#fa0; } #logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: \
6px; } #patch { width: 100%; }
#patch h4 {font-family: \
verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, \
#patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins \
{background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del \
{background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, \
.info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a \
href="http://sources.forgerock.org/changelog/openicf/?cs=6515">6515</a></dd> \
<dt>Author</dt> <dd>Laszlo</dd> <dt>Date</dt> <dd>2014-04-17 16:53:32 +0100 (Thu, 17 \
Apr 2014)</dd> </dl>
<h3>Log Message</h3>
<pre>OPENICF-185 ?\226?\128?\147 Update the test to use different port</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkconnectorsjavascriptedcommonpomxml">trunk/connectors/java/scriptedcommon/pom.xml</a></li>
<li><a href="#trunkconnectorsjavascriptedcommonsrcmaingroovyorgforgerockopenicfmiscsc \
riptedcommonICFObjectBuildergroovy">trunk/connectors/java/scriptedcommon/src/main/groovy/org/forgerock/openicf/misc/scriptedcommon/ICFObjectBuilder.groovy</a></li>
<li><a href="#trunkconnectorsjavascriptedcommonsrctestconfigorgforgerockopenicfmiscsc \
riptedcommonScriptedConnectorBaseconfigconfiggroovy">trunk/connectors/java/scriptedcom \
mon/src/test/config/org.forgerock.openicf.misc.scriptedcommon.ScriptedConnectorBase/config/config.groovy</a></li>
<li><a href="#trunkconnectorsjavascriptedcommonsrctestjavaorgforgerockopenicfconnecto \
rsRESTTestBasejava">trunk/connectors/java/scriptedcommon/src/test/java/org/forgerock/openicf/connectors/RESTTestBase.java</a></li>
<li><a href="#trunkconnectorsjavascriptedcommonsrctestresourcesgroovySchemaScriptgroo \
vy">trunk/connectors/java/scriptedcommon/src/test/resources/groovy/SchemaScript.groovy</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkconnectorsjavascriptedcommonpomxml"></a>
<div class="modfile"><h4>Modified: trunk/connectors/java/scriptedcommon/pom.xml (6514 \
=> 6515)</h4> <pre class="diff"><span>
<span class="info">--- trunk/connectors/java/scriptedcommon/pom.xml 2014-04-17 \
15:49:39 UTC (rev 6514)
+++ trunk/connectors/java/scriptedcommon/pom.xml 2014-04-17 15:53:32 UTC (rev 6515)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> <!-- maven-compiler-plugin -->
</span><span class="cx"> \
<maven.compiler.target>1.5</maven.compiler.target> </span><span \
class="cx"> <maven.compiler.source>1.6</maven.compiler.source> \
</span><del>- \
<connectorPackage>org.forgerock.openicf.connectors</connectorPackage> \
</del><ins>+ <connectorPackage>org.forgerock.openicf</connectorPackage>
</ins><span class="cx"> \
<connectorClass>ScriptedConnector</connectorClass> </span><span \
class="cx"> <openicf.osgi.import.defaults> </span><span class="cx"> \
org.codehaus.groovy*;version="[1.8,3)",groovy*;version="[1.8,3)" \
</span><span class="lines">@@ -248,6 +248,25 @@ </span><span class="cx"> \
<extensions>true</extensions> </span><span class="cx"> \
</plugin> </span><span class="cx"> <plugin>
</span><ins>+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>jetty.http.port</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
</ins><span class="cx"> \
<groupId>org.forgerock.maven.plugins</groupId> </span><span class="cx"> \
<artifactId>openicf-maven-plugin</artifactId> </span><span class="cx"> \
<dependencies> </span></span></pre></div>
<a id="trunkconnectorsjavascriptedcommonsrcmaingroovyorgforgerockopenicfmiscscriptedcommonICFObjectBuildergroovy"></a>
<div class="modfile"><h4>Modified: \
trunk/connectors/java/scriptedcommon/src/main/groovy/org/forgerock/openicf/misc/scriptedcommon/ICFObjectBuilder.groovy \
(6514 => 6515)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/connectors/java/scriptedcommon/src/main/groovy/org/forgerock/openicf/misc/scriptedcommon/ICFObjectBuilder.groovy 2014-04-17 \
15:49:39 UTC (rev 6514)
+++ trunk/connectors/java/scriptedcommon/src/main/groovy/org/forgerock/openicf/misc/scriptedcommon/ICFObjectBuilder.groovy 2014-04-17 \
15:53:32 UTC (rev 6515) </span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> import \
org.identityconnectors.framework.common.objects.ObjectClass </span><span class="cx"> \
import org.identityconnectors.framework.common.objects.ObjectClassInfo </span><span \
class="cx"> import org.identityconnectors.framework.common.objects.ObjectClassInfoBuilder
</span><ins>+import \
org.identityconnectors.framework.common.objects.OperationOptionInfo +import \
org.identityconnectors.framework.common.objects.OperationOptionInfoBuilder \
</ins><span class="cx"> import org.identityconnectors.framework.common.objects.Schema \
</span><span class="cx"> import \
org.identityconnectors.framework.common.objects.SchemaBuilder </span><span \
class="cx"> import org.identityconnectors.framework.common.objects.SyncDelta \
</span><span class="lines">@@ -59,7 +61,8 @@ </span><span class="cx"> \
this.connectorClass = connectorClass </span><span class="cx"> }
</span><span class="cx">
</span><del>- static private <B> AbstractICFBuilder<B> \
delegateToTag(Class<? extends AbstractICFBuilder<B>> clazz, Closure body, \
B builder) { </del><ins>+ static
+ private <B> AbstractICFBuilder<B> delegateToTag(Class<? extends \
AbstractICFBuilder<B>> clazz, Closure body, B builder) { </ins><span \
class="cx"> AbstractICFBuilder<B> tag = (AbstractICFBuilder<B>) \
clazz.newInstance(builder) </span><span class="cx"> def clone = \
body.rehydrate(tag, this, this) </span><span class="cx"> \
clone.resolveStrategy = Closure.DELEGATE_FIRST </span><span class="lines">@@ -172,9 \
+175,53 @@ </span><span class="cx"> delegateToTag(ObjectClassDelegate, \
attribute) </span><span class="cx"> }
</span><span class="cx">
</span><ins>+ void operationOption(@DelegatesTo(OperationOptionDelegate) \
Closure options) { + delegateToTag(OperationOptionDelegate, options)
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ private static class OperationOptionDelegate extends \
AbstractICFBuilder<SchemaBuilder> { </ins><span class="cx">
</span><ins>+ private OperationOptionInfoBuilder infoBuilder = new \
OperationOptionInfoBuilder(null, String); + private Set<Class<? extends \
SPIOperation>> unsupported = new HashSet<Class<? extends \
SPIOperation>>(12) +
+ OperationOptionDelegate(SchemaBuilder builder) {
+ super(builder)
+ }
+
+ void disable(Class<? extends SPIOperation>... operation) {
+ if (null != operation) {
+ for (Class<? extends SPIOperation> clazz in operation) {
+ unsupported.add(clazz)
+ }
+ }
+ }
+
+ void name(String name) {
+ infoBuilder.setName(name)
+ }
+
+ void type(Class<?> type) {
+ infoBuilder.setType(type)
+ }
+
+ void define(OperationOptionInfo info) {
+ infoBuilder.setName(info.name);
+ infoBuilder.setType(info.type);
+ }
+
+ @Override
+ protected void complete() {
+ final OperationOptionInfo info = infoBuilder.build();
+
+ ((SchemaBuilder) builder).defineOperationOption(info);
+ for (Class<? extends SPIOperation> clazz in unsupported) {
+ ((SchemaBuilder) builder).removeSupportedOperationOption(clazz, \
info) + }
+ }
+ }
+
</ins><span class="cx"> private static class ObjectClassDelegate extends \
AbstractICFBuilder<SchemaBuilder> { </span><span class="cx">
</span><span class="cx"> private ObjectClassInfoBuilder infoBuilder = new \
ObjectClassInfoBuilder() </span></span></pre></div>
<a id="trunkconnectorsjavascriptedcommonsrctestconfigorgforgerockopenicfmiscscriptedcommonScriptedConnectorBaseconfigconfiggroovy"></a>
<div class="modfile"><h4>Modified: \
trunk/connectors/java/scriptedcommon/src/test/config/org.forgerock.openicf.misc.scriptedcommon.ScriptedConnectorBase/config/config.groovy \
(6514 => 6515)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/connectors/java/scriptedcommon/src/test/config/org.forgerock.openicf.misc.scriptedcommon.ScriptedConnectorBase/config/config.groovy 2014-04-17 \
15:49:39 UTC (rev 6514)
+++ trunk/connectors/java/scriptedcommon/src/test/config/org.forgerock.openicf.misc.scriptedcommon.ScriptedConnectorBase/config/config.groovy 2014-04-17 \
15:53:32 UTC (rev 6515) </span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> CREST {
</span><span class="cx"> configuration {
</span><span class="cx"> classpath = \
[URLDecoder.decode(ScriptedConnectorBase.class.getResource("/crest/").file, \
"UTF-8")] </span><del>- serviceAddress = new \
URI("http://localhost:8080/crest/") </del><ins>+ serviceAddress \
= new URI("http://localhost:28080/crest/") </ins><span class="cx"> \
login = "admin" </span><span class="cx"> password = new \
GuardedString("Passw0rd".toCharArray()) </span><span class="cx"> }
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> REST {
</span><span class="cx"> configuration {
</span><span class="cx"> classpath = \
[URLDecoder.decode(ScriptedConnectorBase.class.getResource("/rest/").file, \
"UTF-8")] </span><del>- serviceAddress = new \
URI("http://localhost:8080/rest/") </del><ins>+ serviceAddress = \
new URI("http://localhost:28080/rest/") </ins><span class="cx"> \
username = "admin" </span><span class="cx"> password = new \
GuardedString("Passw0rd".toCharArray()) </span><span class="cx"> }
</span></span></pre></div>
<a id="trunkconnectorsjavascriptedcommonsrctestjavaorgforgerockopenicfconnectorsRESTTestBasejava"></a>
<div class="modfile"><h4>Modified: \
trunk/connectors/java/scriptedcommon/src/test/java/org/forgerock/openicf/connectors/RESTTestBase.java \
(6514 => 6515)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/connectors/java/scriptedcommon/src/test/java/org/forgerock/openicf/connectors/RESTTestBase.java 2014-04-17 \
15:49:39 UTC (rev 6514)
+++ trunk/connectors/java/scriptedcommon/src/test/java/org/forgerock/openicf/connectors/RESTTestBase.java 2014-04-17 \
15:53:32 UTC (rev 6515) </span><span class="lines">@@ -99,10 +99,14 @@
</span><span class="cx">
</span><span class="cx"> @BeforeSuite
</span><span class="cx"> public void startServer() throws Exception {
</span><del>- System.out.append("Test port: \
").println(System.getProperty("jetty.http.port")); </del><ins>+ \
String httpPort = "28080";//System.getProperty("jetty.http.port", \
"208080"); + System.out.append("Test port: \
").println(httpPort); </ins><span class="cx"> // Create a basic jetty \
server object that will listen on port 8080. </span><span class="cx"> // you \
can programmatically obtain it for use in test cases. </span><del>- server = \
new Server(8080); </del><ins>+ server = new \
Server(Integer.parseInt(httpPort)); + for (org.eclipse.jetty.server.Connector \
c : server.getConnectors()) { + c.setHost("127.0.0.1");
+ }
</ins><span class="cx">
</span><span class="cx"> // Initializing the security handler
</span><span class="cx"> ServletContextHandler handler =
</span></span></pre></div>
<a id="trunkconnectorsjavascriptedcommonsrctestresourcesgroovySchemaScriptgroovy"></a>
<div class="modfile"><h4>Modified: \
trunk/connectors/java/scriptedcommon/src/test/resources/groovy/SchemaScript.groovy \
(6514 => 6515)</h4> <pre class="diff"><span>
<span class="info">--- \
trunk/connectors/java/scriptedcommon/src/test/resources/groovy/SchemaScript.groovy 2014-04-17 \
15:49:39 UTC (rev 6514)
+++ trunk/connectors/java/scriptedcommon/src/test/resources/groovy/SchemaScript.groovy 2014-04-17 \
15:53:32 UTC (rev 6515) </span><span class="lines">@@ -23,16 +23,21 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx">
</span><del>-import org.identityconnectors.common.logging.Log
</del><span class="cx"> import \
org.forgerock.openicf.misc.scriptedcommon.OperationType </span><span class="cx"> \
import org.forgerock.openicf.misc.scriptedcommon.ScriptedConfiguration \
</span><ins>+import org.identityconnectors.common.logging.Log </ins><span class="cx"> \
import org.identityconnectors.common.security.GuardedByteArray </span><span \
class="cx"> import org.identityconnectors.common.security.GuardedString \
</span><del>-import \
org.identityconnectors.framework.common.objects.AttributeInfo
-import org.identityconnectors.framework.common.objects.AttributeInfoBuilder
</del><span class="cx"> import \
org.identityconnectors.framework.common.objects.ObjectClass </span><span class="cx"> \
import org.identityconnectors.framework.common.objects.OperationalAttributeInfos \
</span><span class="cx"> import \
org.identityconnectors.framework.common.objects.PredefinedAttributeInfos \
</span><ins>+import org.identityconnectors.framework.spi.operations.AuthenticateOp \
+import org.identityconnectors.framework.spi.operations.ResolveUsernameOp +import \
org.identityconnectors.framework.spi.operations.SchemaOp +import \
org.identityconnectors.framework.spi.operations.ScriptOnConnectorOp +import \
org.identityconnectors.framework.spi.operations.ScriptOnResourceOp +import \
org.identityconnectors.framework.spi.operations.SyncOp +import \
org.identityconnectors.framework.spi.operations.TestOp </ins><span class="cx">
</span><span class="cx"> import static \
org.identityconnectors.framework.common.objects.AttributeInfo.Flags.MULTIVALUED \
</span><span class="cx"> import static \
org.identityconnectors.framework.common.objects.AttributeInfo.Flags.NOT_CREATABLE \
</span><span class="lines">@@ -50,12 +55,12 @@ </span><span class="cx"> type \
ObjectClass.ACCOUNT_NAME </span><span class="cx"> attribute \
OperationalAttributeInfos.CURRENT_PASSWORD </span><span class="cx"> attribute \
PredefinedAttributeInfos.DESCRIPTION </span><del>- attribute 'createDate', \
Integer.class </del><span class="cx"> attribute 'groups', String.class, \
EnumSet.of(MULTIVALUED) </span><span class="cx"> attributes {
</span><del>- username String.class, REQUIRED
</del><ins>+ userName String.class, REQUIRED
</ins><span class="cx"> email REQUIRED, MULTIVALUED
</span><del>- active Boolean.class, NOT_UPDATEABLE
</del><ins>+ active Boolean.class
+ createDate Integer.class, NOT_CREATABLE, NOT_UPDATEABLE
</ins><span class="cx"> lastModified NOT_UPDATEABLE, NOT_CREATABLE, \
NOT_RETURNED_BY_DEFAULT </span><span class="cx"> sureName()
</span><span class="cx"> passwordHistory String.class, MULTIVALUED, \
NOT_READABLE, NOT_RETURNED_BY_DEFAULT </span><span class="lines">@@ -63,6 +68,12 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> objectClass {
</span><ins>+ type ObjectClass.GROUP_NAME
+ attribute PredefinedAttributeInfos.DESCRIPTION
+ attributes {
+ }
+ }
+ objectClass {
</ins><span class="cx"> type '__TEST__'
</span><span class="cx"> container()
</span><span class="cx"> attributes {
</span><span class="lines">@@ -134,5 +145,13 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ operationOption {
+ name "notify"
+ disable AuthenticateOp, ResolveUsernameOp, SchemaOp, ScriptOnConnectorOp, \
ScriptOnResourceOp, SyncOp, TestOp + }
+ operationOption {
+ name "force"
+ type Boolean
+ }
</ins><span class="cx"> }
</span><span class="cx"> )
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
<div id="footer">Copyright (c) by ForgeRock. All rights reserved.</div>
</body>
</html>
_______________________________________________
Commitopenicf mailing list
Commitopenicf@forgerock.org
https://lists.forgerock.org/mailman/listinfo/commitopenicf
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic