Skip to content

Commit

Permalink
Move the sakai directory into common.
Browse files Browse the repository at this point in the history
Remove the standalone directory and all references.
Move common to top level
Adjust the login filter so that it throws a normal unauthorised exception. Ideally this filter should be removed entirely.

Issue: SAK-29217
  • Loading branch information
steveswinsburg committed Mar 31, 2015
1 parent 870e13e commit e31b19a
Show file tree
Hide file tree
Showing 43 changed files with 0 additions and 307 deletions.
53 changes: 0 additions & 53 deletions sections/sections-app/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -180,59 +180,6 @@
<reports />
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.0</version>
<configuration>
<webResources>
<resource>
<!-- this is relative to the this pom.xml directory -->
<directory>${basedir}/src/webapp/sakai</directory>
<includes>
<include>**/*.*</include>
</includes>
</resource>
</webResources>
</configuration>
</plugin>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<configuration>
<tasks>
<delete dir="${project.build.directory}/${project.build.finalName}/common" />
<delete dir="${project.build.directory}/${project.build.finalName}/sakai" />
<delete dir="${project.build.directory}/${project.build.finalName}/standalone" />
<echo message="Copying common resources into sakai and standalone webapps" />
<copy todir="${project.build.directory}/${project.build.finalName}" overwrite="true">
<fileset dir="${basedir}/src/webapp/common" />
</copy>
<copy todir="${project.build.directory}/${project.build.finalName}_standalone" overwrite="true">
<fileset dir="${basedir}/src/webapp/common" />
</copy>
<echo message="Copying sakai dependent resources into sakai webapp" />
<copy todir="${project.build.directory}/${project.build.finalName}" overwrite="true">
<fileset dir="${basedir}/src/webapp/sakai/">
<include name="**/*" />
</fileset>
</copy>
<echo message="Copying standalone resources into standalone webapp" />
<copy todir="${project.build.directory}/${project.build.finalName}_standalone" overwrite="true">
<fileset dir="${basedir}/src/webapp/standalone/">
<include name="**/*" />
</fileset>
</copy>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,6 @@
<param-name>contextManagementServiceBean</param-name>
<param-value>org.sakaiproject.section.api.facade.manager.Context</param-value>
</init-param>
<init-param>
<param-name>selectSiteRedirect</param-name>
<param-value>/sakai-sections-tool/standalone/login.jsf</param-value>
</init-param>
</filter>
<filter-mapping>
<filter-name>SectionAuthzFilter</filter-name>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
/* Non-section-specific CSS class definitions and overrides. */
/*
We include this in the common directory to let integrated deployments experiment
with the original look and feel.
*/

body {
font-family:verdana,arial,helvetica,sans-serif;
Expand Down
File renamed without changes.
File renamed without changes.

This file was deleted.

This file was deleted.

111 changes: 0 additions & 111 deletions sections/sections-app/src/webapp/standalone/WEB-INF/web.xml

This file was deleted.

5 changes: 0 additions & 5 deletions sections/sections-app/src/webapp/standalone/inc/coda.jspf

This file was deleted.

20 changes: 0 additions & 20 deletions sections/sections-app/src/webapp/standalone/inc/prelude.jspf

This file was deleted.

33 changes: 0 additions & 33 deletions sections/sections-app/src/webapp/standalone/standalone/config.jsp

This file was deleted.

43 changes: 0 additions & 43 deletions sections/sections-app/src/webapp/standalone/standalone/login.jsp

This file was deleted.

0 comments on commit e31b19a

Please sign in to comment.