Skip to content

Commit

Permalink
broke down ldap module
Browse files Browse the repository at this point in the history
  • Loading branch information
SavvasMisaghMoayyed committed Oct 20, 2015
1 parent 3509716 commit 66805df
Show file tree
Hide file tree
Showing 13 changed files with 181 additions and 18 deletions.
2 changes: 2 additions & 0 deletions cas-server-support-ldap-monitor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ad.properties
openldap.properties
81 changes: 81 additions & 0 deletions cas-server-support-ldap-monitor/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to Apereo under one or more contributor license
~ agreements. See the NOTICE file distributed with this work
~ for additional information regarding copyright ownership.
~ Apereo 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 the following location:
~
~ 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 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.cas</groupId>
<artifactId>cas-server</artifactId>
<version>4.2.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cas-server-support-ldap-monitor</artifactId>
<packaging>jar</packaging>
<name>Apereo CAS LDAP Monitor Support</name>

<developers>
<developer>
<id>serac</id>
<name>Marvin S. Addison</name>
<email>[email protected]</email>
<timezone>-5</timezone>
<roles>
<role>developer</role>
<role>maintainer</role>
</roles>
</developer>
</developers>

<dependencies>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-support-ldap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
<artifactId>cas-server-support-ldap</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>com.unboundid</groupId>
<artifactId>unboundid-ldapsdk</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ldaptive</groupId>
<artifactId>ldaptive-unboundid</artifactId>
<version>${ldaptive.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<properties>
<cs.dir>${project.parent.basedir}</cs.dir>
</properties>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,10 @@
under the License.
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:context="http://www.springframework.org/schema/context"
xmlns:c="http://www.springframework.org/schema/c"
xmlns:p="http://www.springframework.org/schema/p"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">


<alias name="provisioningConnectionFactory" alias="connectionFactoryMonitorConnectionFactory" />
<alias name="searchValidator" alias="connectionFactoryMonitorValidator" />

</beans>
<project name="Apereo CAS ${project.version}">
<body>
<menu ref="parent"/>
<menu ref="reports" name="Reports" inherit="top"/>
<menu ref="modules" name="Modules" inherit="top"/>
</body>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
/*
* Licensed to Apereo under one or more contributor license
* agreements. See the NOTICE file distributed with this work
* for additional information regarding copyright ownership.
* Apereo 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 the following location:
*
* 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.
*/
package org.jasig.cas;

import org.jasig.cas.monitor.ConnectionFactoryMonitorTests;
import org.jasig.cas.monitor.PooledConnectionFactoryMonitorTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;

/**
* Test suite to run all LDAP tests.
* @author Misagh Moayyed
* @since 4.1.0
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
ConnectionFactoryMonitorTests.class,
PooledConnectionFactoryMonitorTests.class,
})
public class AllTestsSuite {
}
53 changes: 53 additions & 0 deletions cas-server-support-ldap-monitor/src/test/resources/log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!--
Licensed to Apereo under one or more contributor license
agreements. See the NOTICE file distributed with this work
for additional information regarding copyright ownership.
Apereo 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 the following location:
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.
-->

<Configuration>
<Appenders>
<Console name="console" target="SYSTEM_OUT">
<PatternLayout pattern="%d %p [%c] - &lt;%m&gt;%n"/>
</Console>
<RollingFile name="file" fileName="target/ldap.log" append="true"
filePattern="ldap-%d{yyyy-MM-dd-HH}-%i.log.gz">
<PatternLayout pattern="%d %p [%c] - %m%n"/>
<Policies>
<OnStartupTriggeringPolicy />
<SizeBasedTriggeringPolicy size="10 MB"/>
<TimeBasedTriggeringPolicy />
</Policies>
</RollingFile>
</Appenders>
<Loggers>
<Logger name="org.jasig" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Logger name="org.ldaptive" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Logger name="org.springframework" level="warn" additivity="false">
<AppenderRef ref="console"/>
</Logger>
<Root level="warn">
<AppenderRef ref="console"/>
</Root>
</Loggers>
</Configuration>
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
package org.jasig.cas;

import org.jasig.cas.authentication.LdapAuthenticationHandlerTests;
import org.jasig.cas.monitor.ConnectionFactoryMonitorTests;
import org.jasig.cas.monitor.PooledConnectionFactoryMonitorTests;
import org.jasig.cas.userdetails.LdapUserDetailsServiceTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
Expand All @@ -33,8 +31,6 @@
@RunWith(Suite.class)
@Suite.SuiteClasses({
LdapAuthenticationHandlerTests.class,
ConnectionFactoryMonitorTests.class,
PooledConnectionFactoryMonitorTests.class,
LdapUserDetailsServiceTests.class
})
public class AllTestsSuite {
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1406,6 +1406,7 @@
<module>cas-server-support-jpa-service-registry</module>
<module>cas-server-support-ldap</module>
<module>cas-server-support-ldap-service-registry</module>
<module>cas-server-support-ldap-monitor</module>
<module>cas-server-support-openid</module>
<module>cas-server-support-wsfederation</module>
<module>cas-server-support-radius</module>
Expand Down

0 comments on commit 66805df

Please sign in to comment.