From 75222872855b69d1dc23a56dc0996cdb8016b572 Mon Sep 17 00:00:00 2001
From: Steve Swinsburg <steve.swinsburg@gmail.com>
Date: Thu, 5 Sep 2013 21:42:11 +1000
Subject: [PATCH] Add Sakai Connector Portlet to build

---
 pom.xml                                       |   1 +
 uportal-ear/pom.xml                           |   7 +
 uportal-portlets-overlay/pom.xml              |   1 +
 .../sakai-connector-portlet/.gitignore        |   5 +
 .../sakai-connector-portlet/pom.xml           |  52 ++++++++
 .../src/main/webapp/WEB-INF/log4j.properties  |  52 ++++++++
 .../sakai-connector-portlet/src/site/site.xml |  44 +++++++
 .../sakai-connector.portlet-definition.xml    | 120 ++++++++++++++++++
 8 files changed, 282 insertions(+)
 create mode 100644 uportal-portlets-overlay/sakai-connector-portlet/.gitignore
 create mode 100644 uportal-portlets-overlay/sakai-connector-portlet/pom.xml
 create mode 100644 uportal-portlets-overlay/sakai-connector-portlet/src/main/webapp/WEB-INF/log4j.properties
 create mode 100644 uportal-portlets-overlay/sakai-connector-portlet/src/site/site.xml
 create mode 100644 uportal-war/src/main/data/quickstart_entities/portlet-definition/sakai-connector.portlet-definition.xml

diff --git a/pom.xml b/pom.xml
index 43459cf6500..dd36ca2cc29 100755
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,7 @@
         <jasig-widget-portlets.version>2.0.0</jasig-widget-portlets.version>
         <NewsReaderPortlet.version>3.0.7</NewsReaderPortlet.version>
         <NotificationPortlet.version>2.0.4</NotificationPortlet.version>
+        <sakai-connector-portlet.version>1.5.2</sakai-connector-portlet.version>
         <SimpleContentPortlet.version>1.0.8-M1</SimpleContentPortlet.version>
         <WeatherPortlet.version>1.1.0</WeatherPortlet.version>
         <WebProxyPortlet.version>2.0.0-M2</WebProxyPortlet.version>
diff --git a/uportal-ear/pom.xml b/uportal-ear/pom.xml
index 9892747e42e..59fae2e1f0d 100755
--- a/uportal-ear/pom.xml
+++ b/uportal-ear/pom.xml
@@ -113,6 +113,13 @@
             <version>${project.version}</version>
             <type>war</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.jasig.portal.portlets-overlay</groupId>
+            <artifactId>sakai-connector</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+        </dependency>
 
         <dependency>
             <groupId>org.jasig.portal.portlets-overlay</groupId>
diff --git a/uportal-portlets-overlay/pom.xml b/uportal-portlets-overlay/pom.xml
index 9bd71e67144..2f3de4c258c 100644
--- a/uportal-portlets-overlay/pom.xml
+++ b/uportal-portlets-overlay/pom.xml
@@ -28,6 +28,7 @@
         <module>pluto-testsuite</module>
         <module>NewsReaderPortlet</module>
         <module>NotificationPortlet</module>
+		<module>sakai-connector-portlet</module>
         <module>SimpleContentPortlet</module>
         <module>WeatherPortlet</module>
         <module>WebProxyPortlet</module>
diff --git a/uportal-portlets-overlay/sakai-connector-portlet/.gitignore b/uportal-portlets-overlay/sakai-connector-portlet/.gitignore
new file mode 100644
index 00000000000..9c8c9e25eb3
--- /dev/null
+++ b/uportal-portlets-overlay/sakai-connector-portlet/.gitignore
@@ -0,0 +1,5 @@
+/.settings
+/.project
+/.classpath
+/bin
+/target
diff --git a/uportal-portlets-overlay/sakai-connector-portlet/pom.xml b/uportal-portlets-overlay/sakai-connector-portlet/pom.xml
new file mode 100644
index 00000000000..2b8b15c1f1a
--- /dev/null
+++ b/uportal-portlets-overlay/sakai-connector-portlet/pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.jasig.portal.portlets-overlay</groupId>
+        <artifactId>uportal-portlets-overlay</artifactId>
+        <version>4.1.0-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>sakai-connector</artifactId>
+    <packaging>war</packaging>
+
+    <name>Sakai Connector Portlet</name>
+    <description>Overlay on the Sakai Connector Portlet</description>
+
+    <dependencies>
+        <!-- ===== Compile Time Dependencies ============================== -->
+        <dependency>
+            <groupId>org.jasig.portlet</groupId>
+            <artifactId>sakai-connector</artifactId>
+            <version>${sakai-connector-portlet.version}</version>
+            <type>war</type>
+        </dependency>
+    </dependencies>
+    
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <filters>
+                        <filter>${basedir}/../../${filters.file}</filter>
+                    </filters>
+                    <webResources>
+                        <resource>
+                            <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+                            <targetPath>WEB-INF</targetPath>
+                            <filtering>true</filtering>
+                        </resource>
+                    </webResources>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.portals.pluto</groupId>
+                <artifactId>maven-pluto-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/uportal-portlets-overlay/sakai-connector-portlet/src/main/webapp/WEB-INF/log4j.properties b/uportal-portlets-overlay/sakai-connector-portlet/src/main/webapp/WEB-INF/log4j.properties
new file mode 100644
index 00000000000..4194ce4aacb
--- /dev/null
+++ b/uportal-portlets-overlay/sakai-connector-portlet/src/main/webapp/WEB-INF/log4j.properties
@@ -0,0 +1,52 @@
+###########################################################################
+# Log file variables, such as "{environment.build.log.rootLevel}" are defined
+# by properties in the uPortal/filters directory.  See the Building
+# and Deploying uPortal section of the uPortal manual
+
+###########################################################################
+# Adjust logging level to appropriate level of logging.  Once
+# everything is running, using WARN or ERROR will turn off
+# tons of debug messages.
+#
+log4j.rootCategory=${environment.build.log.rootLevel}, R
+
+# Set log levels for specific packages
+#log4j.logger.au.edu.anu.portal.portlets.cache = DEBUG
+#log4j.category.net.sf.ehcache = DEBUG
+
+
+###########################################################################
+# Setup a rolling file appender
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+
+###########################################################################
+# Uncomment the next line to have messages go to stdout (System.out)
+#log4j.appender.R=org.apache.log4j.ConsoleAppender
+
+# This is the path to the log file. It's usually set to something like
+# c:\\portal\\logs\\portal.log or /opt/portal/logs/portal.log
+# Relative file names will be relative to the directory specified by the
+# user.dir System property.
+# WARNING: ALL SLASHES MUST BE FORWARD SLASHES OR ESCAPED BACK SLASHES!!!
+#
+log4j.appender.R.File=${environment.build.log.logfileDirectory}/sakai-connector-portlet.log
+
+# This tells log4j what type of encoding to use
+log4j.appender.R.Encoding=UTF-8
+
+# This tells log4j to use PatternLayout for log file formatting
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+
+# Pattern used during debugging
+#log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{MMM/dd HH:mm:ss,SSS} %c{2}.[%x] (%F:%L) - %m%n
+
+# Pattern that should be used when speed is important (it doesn't provide location info)
+log4j.appender.R.layout.ConversionPattern=${environment.build.log.layoutConversionPattern}
+
+# Log file rolling frequency
+log4j.appender.R.DatePattern='.'${environment.build.log.rollingLogFileDatePattern}
+
+# Pattern for performing hourly log rolling, defaults to '.'yyyy-MM-dd
+#log4j.appender.R.DatePattern='.'yyyy-MM-dd-HH
+
+
diff --git a/uportal-portlets-overlay/sakai-connector-portlet/src/site/site.xml b/uportal-portlets-overlay/sakai-connector-portlet/src/site/site.xml
new file mode 100644
index 00000000000..39a61779f2b
--- /dev/null
+++ b/uportal-portlets-overlay/sakai-connector-portlet/src/site/site.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+
+<project name="${project.name} ${project.version}">
+    <bannerLeft>
+        <name>uPortal</name>
+        <src>http://www.jasig.org/sites/jasig.webchuckhosting.com/files/uportalLogo.jpg</src>
+        <href>http://www.jasig.org/uportal</href>
+    </bannerLeft>
+    <bannerRight>
+        <name>JA-SIG</name>
+        <src>http://www.jasig.org/sites/all/themes/jasig2/logo.png</src>
+        <href>http://www.jasig.org</href>
+    </bannerRight>
+    <publishDate position="left" format="MM-dd-yy hh:mm zz"/>
+
+    <body>
+        <breadcrumbs>
+          <item name="Home" href="${project.url}"/>
+        </breadcrumbs>
+    
+        <menu ref="modules" />
+        <menu ref="reports" />
+    </body>
+</project>
diff --git a/uportal-war/src/main/data/quickstart_entities/portlet-definition/sakai-connector.portlet-definition.xml b/uportal-war/src/main/data/quickstart_entities/portlet-definition/sakai-connector.portlet-definition.xml
new file mode 100644
index 00000000000..61d3ea639f5
--- /dev/null
+++ b/uportal-war/src/main/data/quickstart_entities/portlet-definition/sakai-connector.portlet-definition.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License. You may obtain a
+    copy of the License at:
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on
+    an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied. See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<portlet-definition version="4.0" xsi:schemaLocation="https://source.jasig.org/schemas/uportal/io/portlet-definition https://source.jasig.org/schemas/uportal/io/portlet-definition/portlet-definition-4.0.xsd" xmlns:ns2="https://source.jasig.org/schemas/uportal" xmlns="https://source.jasig.org/schemas/uportal/io/portlet-definition" xmlns:ns4="https://source.jasig.org/schemas/uportal/io/portlet-type" xmlns:ns3="https://source.jasig.org/schemas/uportal/io/user" xmlns:ns5="https://source.jasig.org/schemas/uportal/io/event-aggregation" xmlns:ns6="https://source.jasig.org/schemas/uportal/io/permission-owner" xmlns:ns7="https://source.jasig.org/schemas/uportal/io/subscribed-fragment" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ns8="https://source.jasig.org/schemas/uportal/io/stylesheet-descriptor">
+    <title>Sakai Connector (demo)</title>
+    <name>Sakai Connector (demo)</name>
+    <fname>sakai-connector</fname>
+    <desc>Embed tools from any of your Sakai sites directly into the portal.</desc>
+    <type>Portlet</type>
+    <timeout>5000</timeout>
+    <portlet-descriptor>
+        <ns2:webAppName>/sakai-connector</ns2:webAppName>
+        <ns2:portletName>sakai-connector</ns2:portletName>
+    </portlet-descriptor>
+    <category>All categories</category>
+    <group>Everyone</group>
+    <parameter>
+        <name>alternate</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>blockImpersonation</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>disableDynamicTitle</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>editable</name>
+        <value>true</value>
+    </parameter>
+    <parameter>
+        <name>hasAbout</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>hasHelp</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>hideFromMobile</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>highlight</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>printable</name>
+        <value>false</value>
+    </parameter>
+    <parameter>
+        <name>showChrome</name>
+        <value>true</value>
+    </parameter>
+    <portlet-preference>
+        <name>adminPassword</name>
+        <readOnly>false</readOnly>
+        <value>admin</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>adminUsername</name>
+        <readOnly>false</readOnly>
+        <value>admin</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>allowedTools</name>
+        <readOnly>false</readOnly>
+        <value>sakai.announcements:sakai.singleuser:sakai.assignment.grades:blogger:sakai.dropbox:sakai.mailbox:sakai.forums:sakai.gradebook.tool:sakai.podcasts:sakai.poll:sakai.resources:sakai.schedule:sakai.samigo:sakai.rwiki</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>endpoint</name>
+        <readOnly>false</readOnly>
+        <value>http://nightly2.sakaiproject.org:8085/imsblti/provider/</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>key</name>
+        <readOnly>false</readOnly>
+        <value>uportal-integration</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>loginUrl</name>
+        <readOnly>false</readOnly>
+        <value>http://nightly2.sakaiproject.org:8085/sakai-axis/SakaiLogin.jws?wsdl</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>portletTitle</name>
+        <readOnly>false</readOnly>
+        <value>Sakai Connector (demo)</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>scriptUrl</name>
+        <readOnly>false</readOnly>
+        <value>http://nightly2.sakaiproject.org:8085/sakai-axis/SakaiScript.jws?wsdl</value>
+    </portlet-preference>
+    <portlet-preference>
+        <name>secret</name>
+        <readOnly>false</readOnly>
+        <value>secret</value>
+    </portlet-preference>
+</portlet-definition>