Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[SHIRO-679] Shiro modules have split packages #236

Merged
merged 1 commit into from
May 13, 2020
Merged

[SHIRO-679] Shiro modules have split packages #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cache/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<Bundle-SymbolicName>org.apache.shiro.cache</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.cache*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
Expand Down
6 changes: 3 additions & 3 deletions cache/src/main/java/org/apache/shiro/cache/AbstractCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
*/
package org.apache.shiro.cache;

import org.apache.shiro.util.Destroyable;
import org.apache.shiro.util.LifecycleUtils;
import org.apache.shiro.util.StringUtils;
import org.apache.shiro.lang.util.Destroyable;
import org.apache.shiro.lang.util.LifecycleUtils;
import org.apache.shiro.lang.util.StringUtils;

import java.util.Collection;
import java.util.concurrent.ConcurrentHashMap;
Expand Down
2 changes: 1 addition & 1 deletion cache/src/main/java/org/apache/shiro/cache/CacheException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.shiro.cache;

import org.apache.shiro.ShiroException;
import org.apache.shiro.lang.ShiroException;


/**
Expand Down
2 changes: 1 addition & 1 deletion cache/src/main/java/org/apache/shiro/cache/MemoryConstrainedCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.shiro.cache;

import org.apache.shiro.util.SoftHashMap;
import org.apache.shiro.lang.util.SoftHashMap;

/**
* Simple memory-only based {@link CacheManager CacheManager} implementation usable in production
Expand Down
2 changes: 1 addition & 1 deletion config/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Bundle-SymbolicName>org.apache.shiro.config.core</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion config/core/src/main/java/org/apache/shiro/config/ConfigurationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
package org.apache.shiro.config;

import org.apache.shiro.ShiroException;
import org.apache.shiro.lang.ShiroException;


/**
Expand Down
4 changes: 2 additions & 2 deletions config/core/src/main/java/org/apache/shiro/config/Ini.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
*/
package org.apache.shiro.config;

import org.apache.shiro.io.ResourceUtils;
import org.apache.shiro.util.StringUtils;
import org.apache.shiro.lang.io.ResourceUtils;
import org.apache.shiro.lang.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
6 changes: 4 additions & 2 deletions config/ogdl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.shiro.config.ogdl</Bundle-SymbolicName>
<Export-Package>org.apache.shiro.config*;version=${project.version}</Export-Package>
<Export-Package>org.apache.shiro.config.ogdl.*;version=${project.version}</Export-Package>
<Import-Package>
org.apache.shiro*;version="${shiro.osgi.importRange}",
org.apache.shiro.lang*;version="${shiro.osgi.importRange}",
org.apache.shiro.config*;version="${shiro.osgi.importRange}",
org.apache.shiro.event*;version="${shiro.osgi.importRange}",
*
</Import-Package>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion ...che/shiro/config/CommonsInterpolator.java → ...hiro/config/ogdl/CommonsInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config;
package org.apache.shiro.config.ogdl;

import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.ConstantLookup;
Expand Down
2 changes: 1 addition & 1 deletion ...che/shiro/config/DefaultInterpolator.java → ...hiro/config/ogdl/DefaultInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config;
package org.apache.shiro.config.ogdl;

/**
* This {@link Interpolator} simply returns the original value. This is implementation is useful when interpolation
Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/shiro/config/Interpolator.java → ...pache/shiro/config/ogdl/Interpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config;
package org.apache.shiro.config.ogdl;

/**
* Basic String interpolation interface. Typically implementations will use the Maven/Ant like notation: ${key}, but
Expand Down
33 changes: 17 additions & 16 deletions ...pache/shiro/config/ReflectionBuilder.java → .../shiro/config/ogdl/ReflectionBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config;
package org.apache.shiro.config.ogdl;

import java.beans.PropertyDescriptor;
import java.util.ArrayList;
Expand All @@ -31,24 +31,25 @@
import org.apache.commons.beanutils.BeanUtilsBean;
import org.apache.commons.beanutils.ConvertUtilsBean;
import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector;
import org.apache.shiro.codec.Base64;
import org.apache.shiro.codec.Hex;
import org.apache.shiro.config.event.BeanEvent;
import org.apache.shiro.config.event.ConfiguredBeanEvent;
import org.apache.shiro.config.event.DestroyedBeanEvent;
import org.apache.shiro.config.event.InitializedBeanEvent;
import org.apache.shiro.config.event.InstantiatedBeanEvent;
import org.apache.shiro.lang.codec.Base64;
import org.apache.shiro.lang.codec.Hex;
import org.apache.shiro.config.ConfigurationException;
import org.apache.shiro.config.ogdl.event.BeanEvent;
import org.apache.shiro.config.ogdl.event.ConfiguredBeanEvent;
import org.apache.shiro.config.ogdl.event.DestroyedBeanEvent;
import org.apache.shiro.config.ogdl.event.InitializedBeanEvent;
import org.apache.shiro.config.ogdl.event.InstantiatedBeanEvent;
import org.apache.shiro.event.EventBus;
import org.apache.shiro.event.EventBusAware;
import org.apache.shiro.event.Subscribe;
import org.apache.shiro.event.support.DefaultEventBus;
import org.apache.shiro.util.Assert;
import org.apache.shiro.util.ByteSource;
import org.apache.shiro.util.ClassUtils;
import org.apache.shiro.util.Factory;
import org.apache.shiro.util.LifecycleUtils;
import org.apache.shiro.util.Nameable;
import org.apache.shiro.util.StringUtils;
import org.apache.shiro.lang.util.Assert;
import org.apache.shiro.lang.util.ByteSource;
import org.apache.shiro.lang.util.ClassUtils;
import org.apache.shiro.lang.util.Factory;
import org.apache.shiro.lang.util.LifecycleUtils;
import org.apache.shiro.lang.util.Nameable;
import org.apache.shiro.lang.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -59,7 +60,7 @@
* to construct or modify the SecurityManager, its dependencies, and web-based security filters.
* <p/>
* Recognizes {@link Factory} implementations and will call
* {@link org.apache.shiro.util.Factory#getInstance() getInstance} to satisfy any reference to this bean.
* {@link org.apache.shiro.lang.util.Factory#getInstance() getInstance} to satisfy any reference to this bean.
*
* @since 0.9
*/
Expand Down
4 changes: 3 additions & 1 deletion ...nfig/UnresolveableReferenceException.java → ...ogdl/UnresolveableReferenceException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config;
package org.apache.shiro.config.ogdl;

import org.apache.shiro.config.ConfigurationException;

/**
* Exception thrown when a reference to an object is made, but that object cannot be found. This is most likely
Expand Down
2 changes: 1 addition & 1 deletion .../apache/shiro/config/event/BeanEvent.java → ...he/shiro/config/ogdl/event/BeanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config.event;
package org.apache.shiro.config.ogdl.event;

import org.apache.shiro.event.Event;

Expand Down
4 changes: 2 additions & 2 deletions ...iro/config/event/ConfiguredBeanEvent.java → ...onfig/ogdl/event/ConfiguredBeanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config.event;
package org.apache.shiro.config.ogdl.event;

import java.util.Map;

Expand All @@ -26,7 +26,7 @@
*
* @since 1.3
* @see InstantiatedBeanEvent
* @see org.apache.shiro.util.Initializable Initializable
* @see org.apache.shiro.lang.util.Initializable Initializable
* @see InitializedBeanEvent
* @see DestroyedBeanEvent
*/
Expand Down
4 changes: 2 additions & 2 deletions ...hiro/config/event/DestroyedBeanEvent.java → ...config/ogdl/event/DestroyedBeanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config.event;
package org.apache.shiro.config.ogdl.event;

import java.util.Map;

/**
* Event triggered when a configured bean has been destroyed.
*
* @since 1.3
* @see org.apache.shiro.util.Destroyable Destroyable
* @see org.apache.shiro.lang.util.Destroyable Destroyable
* @see InstantiatedBeanEvent
* @see ConfiguredBeanEvent
* @see InitializedBeanEvent
Expand Down
4 changes: 2 additions & 2 deletions ...ro/config/event/InitializedBeanEvent.java → ...nfig/ogdl/event/InitializedBeanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config.event;
package org.apache.shiro.config.ogdl.event;

import java.util.Map;

/**
* Event triggered when a configured bean has been instantiated, fully configured and initialized.
*
* @since 1.3
* @see org.apache.shiro.util.Initializable Initializable
* @see org.apache.shiro.lang.util.Initializable Initializable
* @see InstantiatedBeanEvent
* @see ConfiguredBeanEvent
* @see DestroyedBeanEvent
Expand Down
4 changes: 2 additions & 2 deletions ...o/config/event/InstantiatedBeanEvent.java → ...fig/ogdl/event/InstantiatedBeanEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config.event;
package org.apache.shiro.config.ogdl.event;

import java.util.Map;

Expand All @@ -27,7 +27,7 @@
* @see ConfiguredBeanEvent
* @see InitializedBeanEvent
* @see DestroyedBeanEvent
* @see org.apache.shiro.util.Initializable Initializable
* @see org.apache.shiro.lang.util.Initializable Initializable
*/
public class InstantiatedBeanEvent extends BeanEvent {

Expand Down
2 changes: 1 addition & 1 deletion ...onfig/event/LoggingBeanEventListener.java → .../ogdl/event/LoggingBeanEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config.event;
package org.apache.shiro.config.ogdl.event;

import org.apache.shiro.event.Subscribe;
import org.slf4j.Logger;
Expand Down
10 changes: 6 additions & 4 deletions ...iro/config/CommonsInterpolatorTest.groovy → ...onfig/ogdl/CommonsInterpolatorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config
package org.apache.shiro.config.ogdl

import org.apache.shiro.config.ogdl.CommonsInterpolator
import org.junit.Test

import static org.junit.Assert.*
import static org.junit.Assert.assertEquals
import static org.junit.Assert.assertNull

/**
* Tests for {@link CommonsInterpolator}.
* Tests for {@link org.apache.shiro.config.ogdl.CommonsInterpolator}.
* @since 1.4
*/
class CommonsInterpolatorTest {
Expand All @@ -41,7 +43,7 @@ class CommonsInterpolatorTest {
def sourceString = """
\${os.name}
\${foobar}
\${const:org.apache.shiro.config.CommonsInterpolatorTest.TEST_ME}
\${const:org.apache.shiro.config.ogdl.CommonsInterpolatorTest.TEST_ME}
Some other text
"""

Expand Down
2 changes: 1 addition & 1 deletion .../apache/shiro/config/CompositeBean.groovy → ...he/shiro/config/ogdl/CompositeBean.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config
package org.apache.shiro.config.ogdl

class CompositeBean {

Expand Down
8 changes: 5 additions & 3 deletions ...iro/config/DefaultInterpolatorTest.groovy → ...onfig/ogdl/DefaultInterpolatorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config
package org.apache.shiro.config.ogdl

import org.apache.shiro.config.ogdl.DefaultInterpolator
import org.junit.Test

import static org.junit.Assert.*
import static org.junit.Assert.assertNull
import static org.junit.Assert.assertSame

/**
* Tests for {@link DefaultInterpolator}.
* Tests for {@link org.apache.shiro.config.ogdl.DefaultInterpolator}.
* @since 1.4
*/
public class DefaultInterpolatorTest {
Expand Down
6 changes: 3 additions & 3 deletions ...che/shiro/config/InitializableBean.groovy → ...hiro/config/ogdl/InitializableBean.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config;
package org.apache.shiro.config.ogdl;

import org.apache.shiro.ShiroException;
import org.apache.shiro.util.Initializable;
import org.apache.shiro.lang.ShiroException;
import org.apache.shiro.lang.util.Initializable;

/**
* @since 1.2.2
Expand Down
4 changes: 2 additions & 2 deletions ...shiro/config/RecordingBeanListener.groovy → .../config/ogdl/RecordingBeanListener.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.shiro.config
package org.apache.shiro.config.ogdl

import org.apache.shiro.config.event.*
import org.apache.shiro.config.ogdl.event.*
import org.apache.shiro.event.Subscribe

/**
Expand Down
Loading