diff --git a/gradle.properties b/gradle.properties index 92e1646..a786efe 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ jspApiVersion=2.3.3 servletApiVersion=4.0.1 junitVersion=4.12 # All building blocks / web services are re-versioned when this changes. -artifactVersion=1.0.1-SNAPSHOT \ No newline at end of file +artifactVersion=1.0.2-SNAPSHOT \ No newline at end of file diff --git a/oeqPrimaryB2/src/main/webapp/admin/config.jsp b/oeqPrimaryB2/src/main/webapp/admin/config.jsp index aae882b..89bdfa0 100644 --- a/oeqPrimaryB2/src/main/webapp/admin/config.jsp +++ b/oeqPrimaryB2/src/main/webapp/admin/config.jsp @@ -11,9 +11,9 @@ <%@page import="blackboard.platform.session.BbSessionManagerService"%> <%@page import="blackboard.platform.BbServiceManager"%> <%@page import="blackboard.platform.context.ContextManager"%> -<%@page import="com.tle.blackboard.buildingblock.data.WrappedUser"%> -<%@page import="com.tle.blackboard.buildingblock.Configuration"%> -<%@page import="com.tle.blackboard.common.BbUtil"%> +<%@page import="org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedUser"%> +<%@page import="org.apereo.openequella.integration.blackboard.buildingblock.Configuration"%> +<%@page import="org.apereo.openequella.integration.blackboard.common.BbUtil"%> <%@ taglib uri="/bbNG" prefix="bbng"%> <%@ taglib uri="/tle" prefix="tle"%> diff --git a/oeqPrimaryB2/src/main/webapp/contribute/create.jsp b/oeqPrimaryB2/src/main/webapp/contribute/create.jsp index aa5e29c..2a9ebc6 100644 --- a/oeqPrimaryB2/src/main/webapp/contribute/create.jsp +++ b/oeqPrimaryB2/src/main/webapp/contribute/create.jsp @@ -1,6 +1,6 @@ <%@page contentType="text/html;charset=UTF-8" errorPage="/error.jsp" %> -<%@page import="com.tle.blackboard.buildingblock.data.WrappedContent"%> +<%@page import="org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedContent"%> <%@ taglib uri="/tle" prefix="tle"%> <%@ taglib uri="/bbNG" prefix="bbng"%> diff --git a/oeqPrimaryB2/src/main/webapp/contribute/modify.jsp b/oeqPrimaryB2/src/main/webapp/contribute/modify.jsp index f2aedb2..7ea800e 100644 --- a/oeqPrimaryB2/src/main/webapp/contribute/modify.jsp +++ b/oeqPrimaryB2/src/main/webapp/contribute/modify.jsp @@ -1,7 +1,7 @@ <%@page contentType="text/html;charset=UTF-8" errorPage="/error.jsp" %> -<%@page import="com.tle.blackboard.buildingblock.data.WrappedContent" %> -<%@page import="com.tle.blackboard.common.BbUtil" %> +<%@page import="org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedContent" %> +<%@page import="org.apereo.openequella.integration.blackboard.common.BbUtil" %> <%@ taglib uri="/bbNG" prefix="bbng"%> <%@ taglib uri="/tle" prefix="tle"%> @@ -19,8 +19,8 @@
- - + + diff --git a/oeqPrimaryB2/src/main/webapp/contribute/modify_proc.jsp b/oeqPrimaryB2/src/main/webapp/contribute/modify_proc.jsp index 5afc8a2..98e9f50 100644 --- a/oeqPrimaryB2/src/main/webapp/contribute/modify_proc.jsp +++ b/oeqPrimaryB2/src/main/webapp/contribute/modify_proc.jsp @@ -1,6 +1,6 @@ <%@page contentType="text/html;charset=UTF-8" errorPage="/error.jsp" %> -<%@page import="com.tle.blackboard.buildingblock.data.WrappedContent" %> +<%@page import="org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedContent" %> <%@ taglib uri="/bbNG" prefix="bbng"%> <%@ taglib uri="/tle" prefix="tle"%> diff --git a/oeqPrimaryB2/src/main/webapp/contribute/remove.jsp b/oeqPrimaryB2/src/main/webapp/contribute/remove.jsp index 2c1fbc5..c734d2e 100644 --- a/oeqPrimaryB2/src/main/webapp/contribute/remove.jsp +++ b/oeqPrimaryB2/src/main/webapp/contribute/remove.jsp @@ -1,6 +1,6 @@ <%@page contentType="text/html;charset=UTF-8" errorPage="/error.jsp" %> -<%@page import="com.tle.blackboard.buildingblock.data.WrappedContent" %> +<%@page import="org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedContent" %> <% new WrappedContent(request).remove(request); diff --git a/oeqPrimaryB2/src/main/webapp/portal/view.jsp b/oeqPrimaryB2/src/main/webapp/portal/view.jsp index 9b029e2..6a2ed1f 100644 --- a/oeqPrimaryB2/src/main/webapp/portal/view.jsp +++ b/oeqPrimaryB2/src/main/webapp/portal/view.jsp @@ -5,7 +5,7 @@ <%@page import="java.util.Map"%> <%@page import="java.net.URLEncoder"%> <%@page - import="com.tle.blackboard.buildingblock.data.WrappedUser,com.tle.blackboard.buildingblock.data.WrappedUser.TaskLink" %> + import="org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedUser,org.apereo.openequella.integration.blackboard.buildingblock.data.WrappedUser.TaskLink" %> <%@taglib uri="http://struts.apache.org/tags-nested" prefix="n"%> <%@taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%> @@ -17,11 +17,11 @@ WrappedUser user; private String link(String path) throws Exception { - String equellaUrl = com.tle.blackboard.buildingblock.Configuration.instance().getEquellaUrl(); + String equellaUrl = org.apereo.openequella.integration.blackboard.buildingblock.Configuration.instance().getEquellaUrl(); String p = path; if (!path.startsWith(equellaUrl)) { - p = com.tle.blackboard.common.PathUtils.urlPath(com.tle.blackboard.buildingblock.Configuration.instance().getEquellaUrl(), path); + p = org.apereo.openequella.integration.blackboard.common.PathUtils.urlPath(org.apereo.openequella.integration.blackboard.buildingblock.Configuration.instance().getEquellaUrl(), path); } if (p.indexOf('?') == -1) { @@ -38,7 +38,7 @@ private String link(String path) throws Exception String rel = null; String dir = null; user = WrappedUser.getUser(request); -rel = com.tle.blackboard.common.BbUtil.getBlockRelativePath(); +rel = org.apereo.openequella.integration.blackboard.common.BbUtil.getBlockRelativePath(); dir = rel + "portal/"; try {